aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-07-08 09:35:20 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-07-22 15:30:33 +0200
commitc1e84cb32296d9e448df1e9cabcc5312a85fb5fe (patch)
tree1641145ed2288c1aab04c984f4f949491e6c8f38
parent78ae3e4a0009d7bb2f2f7f53df2d622fc12d05dc (diff)
downloadmitmproxy-c1e84cb32296d9e448df1e9cabcc5312a85fb5fe.tar.gz
mitmproxy-c1e84cb32296d9e448df1e9cabcc5312a85fb5fe.tar.bz2
mitmproxy-c1e84cb32296d9e448df1e9cabcc5312a85fb5fe.zip
use websockets protocol
-rw-r--r--libpathod/language/http.py4
-rw-r--r--libpathod/pathod.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/libpathod/language/http.py b/libpathod/language/http.py
index 3c9df484..0c4d9419 100644
--- a/libpathod/language/http.py
+++ b/libpathod/language/http.py
@@ -194,7 +194,7 @@ class Response(_HTTPMessage):
1,
Code(101)
)
- hdrs = netlib.websockets.server_handshake_headers(
+ hdrs = netlib.websockets.WebsocketsProtocol.server_handshake_headers(
settings.websocket_key
)
for i in hdrs.lst:
@@ -306,7 +306,7 @@ class Request(_HTTPMessage):
1,
Method("get")
)
- for i in netlib.websockets.client_handshake_headers().lst:
+ for i in netlib.websockets.WebsocketsProtocol.client_handshake_headers().lst:
if not get_header(i[0], self.headers):
tokens.append(
Header(
diff --git a/libpathod/pathod.py b/libpathod/pathod.py
index 148fa7b2..daad64be 100644
--- a/libpathod/pathod.py
+++ b/libpathod/pathod.py
@@ -280,7 +280,7 @@ class PathodHandler(tcp.BaseHandler):
retlog["cipher"] = self.get_current_cipher()
m = utils.MemBool()
- websocket_key = websockets.check_client_handshake(headers)
+ websocket_key = websockets.WebsocketsProtocol.check_client_handshake(headers)
self.settings.websocket_key = websocket_key
# If this is a websocket initiation, we respond with a proper