diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-12-27 21:44:10 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-12-27 22:01:28 +0100 |
| commit | f123fb600dfae40223db44bfda9dba87d8c4eda7 (patch) | |
| tree | e50e561faa2102974b7e4a290b721aeb2cae737a /mitmproxy/proxy | |
| parent | ddb8f43b87306437a8eb720072857bde1f2dcf9b (diff) | |
| download | mitmproxy-f123fb600dfae40223db44bfda9dba87d8c4eda7.tar.gz mitmproxy-f123fb600dfae40223db44bfda9dba87d8c4eda7.tar.bz2 mitmproxy-f123fb600dfae40223db44bfda9dba87d8c4eda7.zip | |
websocket: docs++ and kill messages
fixes #2724
Diffstat (limited to 'mitmproxy/proxy')
| -rw-r--r-- | mitmproxy/proxy/protocol/websocket.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mitmproxy/proxy/protocol/websocket.py b/mitmproxy/proxy/protocol/websocket.py index 1bd5284d..92f99518 100644 --- a/mitmproxy/proxy/protocol/websocket.py +++ b/mitmproxy/proxy/protocol/websocket.py @@ -109,7 +109,7 @@ class WebSocketLayer(base.Layer): self.flow.messages.append(websocket_message) self.channel.ask("websocket_message", self.flow) - if not self.flow.stream: + if not self.flow.stream and not websocket_message.killed: def get_chunk(payload): if len(payload) == length: # message has the same length, we can reuse the same sizes @@ -129,14 +129,9 @@ class WebSocketLayer(base.Layer): self.connections[other_conn].send_data(chunk, final) other_conn.send(self.connections[other_conn].bytes_to_send()) - else: - self.connections[other_conn].send_data(event.data, event.message_finished) - other_conn.send(self.connections[other_conn].bytes_to_send()) - - elif self.flow.stream: + if self.flow.stream: self.connections[other_conn].send_data(event.data, event.message_finished) other_conn.send(self.connections[other_conn].bytes_to_send()) - return True def _handle_ping_received(self, event, source_conn, other_conn, is_server): |