aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-12-01 03:04:48 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-12-01 03:04:48 +0100
commit5b1fefee9bf8564b32a1137975cb181d54ef6dff (patch)
tree3ee810b15c545eb297aaf2158f8c092a0f91d974 /libmproxy/protocol
parent992536c2bc0afa5da81e82cfcd8953663559ff59 (diff)
downloadmitmproxy-5b1fefee9bf8564b32a1137975cb181d54ef6dff.tar.gz
mitmproxy-5b1fefee9bf8564b32a1137975cb181d54ef6dff.tar.bz2
mitmproxy-5b1fefee9bf8564b32a1137975cb181d54ef6dff.zip
add inline script example for websocket passthrough, fix #340
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/http.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 89af85b0..87af8e6d 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -1401,6 +1401,12 @@ class HTTPHandler(ProtocolHandler):
# In practice, nobody issues a CONNECT request to send unencrypted HTTP requests afterwards.
# If we don't delegate to TCP mode, we should always negotiate a SSL connection.
+ #
+ # FIXME:
+ # Turns out the previous statement isn't entirely true. Chrome on Windows CONNECTs to :80
+ # if an explicit proxy is configured and a websocket connection should be established.
+ # We don't support websocket at the moment, so it fails anyway, but we should come up with
+ # a better solution to this if we start to support WebSockets.
should_establish_ssl = (
address.port in self.c.config.ssl_ports
or