aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/net
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2018-06-11 13:24:08 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2018-06-11 13:28:28 +0200
commitbe26958ea83adedcfdd6af7dc713e7f83ffd1314 (patch)
tree82a61d7e4f178897e1a99fb7a8821a328f5170f5 /mitmproxy/net
parent9047c4f2a58d6e6b08d8066fb890b2a13de21fb3 (diff)
downloadmitmproxy-be26958ea83adedcfdd6af7dc713e7f83ffd1314.tar.gz
mitmproxy-be26958ea83adedcfdd6af7dc713e7f83ffd1314.tar.bz2
mitmproxy-be26958ea83adedcfdd6af7dc713e7f83ffd1314.zip
improve websocket frame masking api
Diffstat (limited to 'mitmproxy/net')
-rw-r--r--mitmproxy/net/websockets/frame.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mitmproxy/net/websockets/frame.py b/mitmproxy/net/websockets/frame.py
index ac6a0812..7b93bc24 100644
--- a/mitmproxy/net/websockets/frame.py
+++ b/mitmproxy/net/websockets/frame.py
@@ -71,7 +71,7 @@ class FrameHeader:
else:
self.length_code = length_code
- if mask is DEFAULT and masking_key is DEFAULT:
+ if (mask is DEFAULT and masking_key is DEFAULT) or mask == 0 or mask is False:
self.mask = False
self.masking_key = b""
elif mask is DEFAULT: