diff options
| author | Chandler Abraham <cabraham@twitter.com> | 2015-04-13 13:36:09 -0700 |
|---|---|---|
| committer | Chandler Abraham <cabraham@twitter.com> | 2015-04-13 13:36:09 -0700 |
| commit | 2d72a1b6b56f1643cd1d8be59eee55aa7ca2f17f (patch) | |
| tree | 8e2831fdd659174703f00b4b1cd008cfb70185a2 /netlib/websockets/implementations.py | |
| parent | 0ed2a290639833d772b89cf333577820e84f8204 (diff) | |
| download | mitmproxy-2d72a1b6b56f1643cd1d8be59eee55aa7ca2f17f.tar.gz mitmproxy-2d72a1b6b56f1643cd1d8be59eee55aa7ca2f17f.tar.bz2 mitmproxy-2d72a1b6b56f1643cd1d8be59eee55aa7ca2f17f.zip | |
100% test coverage, though still need plenty more
Diffstat (limited to 'netlib/websockets/implementations.py')
| -rw-r--r-- | netlib/websockets/implementations.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/netlib/websockets/implementations.py b/netlib/websockets/implementations.py index 73a84690..1ded3b85 100644 --- a/netlib/websockets/implementations.py +++ b/netlib/websockets/implementations.py @@ -65,9 +65,6 @@ class WebSocketsClient(tcp.TCPClient): self.wfile.flush() server_handshake = ws.read_handshake(self.rfile.read, 1) - - if not server_handshake: - self.close() server_nounce = ws.process_handshake_from_server(server_handshake, self.client_nounce) @@ -75,11 +72,8 @@ class WebSocketsClient(tcp.TCPClient): self.close() def read_next_message(self): - try: - return ws.WebSocketsFrame.from_byte_stream(self.rfile.read).payload - except IndexError: - self.close() - + return ws.WebSocketsFrame.from_byte_stream(self.rfile.read).payload + def send_message(self, message): frame = ws.WebSocketsFrame.default(message, from_client = True) self.wfile.write(frame.safe_to_bytes()) |