diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 14:55:35 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-03 14:55:35 +1200 |
| commit | 08e4cd2a40778a1a10eef1bba0d2c167f6edeea9 (patch) | |
| tree | a36d0a637ae2a46c8425c56439927ff04392b5ef /pathod/protocols/websockets.py | |
| parent | 25671b91bd16d7c355742a6094addad00e331af5 (diff) | |
| parent | a2d13714a6d73595820e8ca7bdada3a4eabec36e (diff) | |
| download | mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.tar.gz mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.tar.bz2 mitmproxy-08e4cd2a40778a1a10eef1bba0d2c167f6edeea9.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'pathod/protocols/websockets.py')
| -rw-r--r-- | pathod/protocols/websockets.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pathod/protocols/websockets.py b/pathod/protocols/websockets.py index 134d27bc..2b60e618 100644 --- a/pathod/protocols/websockets.py +++ b/pathod/protocols/websockets.py @@ -18,7 +18,7 @@ class WebsocketsProtocol: frm = websockets.Frame.from_file(self.pathod_handler.rfile) except NetlibException as e: lg("Error reading websocket frame: %s" % e) - break + return None, None ended = time.time() lg(frm.human_readable()) retlog = dict( |