aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-26 12:56:26 +0200
committerGitHub <noreply@github.com>2017-07-26 12:56:26 +0200
commit6fcd1895bb366c8c14eee28c5bdb097680fcfb15 (patch)
tree215b27164235418a34280ff12ec162b76df51801
parent1004460ba670c503702a46c01518c1da19c5047c (diff)
downloadmitmproxy-6fcd1895bb366c8c14eee28c5bdb097680fcfb15.tar.gz
mitmproxy-6fcd1895bb366c8c14eee28c5bdb097680fcfb15.tar.bz2
mitmproxy-6fcd1895bb366c8c14eee28c5bdb097680fcfb15.zip
add comment explaining upstream connect logic
-rw-r--r--mitmproxy/proxy/protocol/http.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mitmproxy/proxy/protocol/http.py b/mitmproxy/proxy/protocol/http.py
index 728c2ba1..a366861d 100644
--- a/mitmproxy/proxy/protocol/http.py
+++ b/mitmproxy/proxy/protocol/http.py
@@ -217,6 +217,8 @@ class HttpLayer(base.Layer):
return False
def handle_upstream_connect(self, f):
+ # if the user specifies a response in the http_connect hook, we do not connect upstream here.
+ # https://github.com/mitmproxy/mitmproxy/pull/2473
if not f.response:
self.establish_server_connection(
f.request.host,