aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol/http.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-02-14 16:37:20 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-02-14 16:37:20 +0100
commitced78ba1075289d0df716b1541a91929d7c91de9 (patch)
tree796235d2725735bb4f94363ae9eba35c843e9642 /libmproxy/protocol/http.py
parent885e619a7e5a1a0263c0b751d8ef924522978b56 (diff)
parentea0ba6d143106eafaf6bbc15ee60e0fe82c049c0 (diff)
downloadmitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.tar.gz
mitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.tar.bz2
mitmproxy-ced78ba1075289d0df716b1541a91929d7c91de9.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/protocol/http.py')
-rw-r--r--libmproxy/protocol/http.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py
index 4a86f9da..13d7903b 100644
--- a/libmproxy/protocol/http.py
+++ b/libmproxy/protocol/http.py
@@ -242,7 +242,6 @@ class HttpLayer(Layer):
self.send_response(response)
except (NetlibException, H2Error):
self.log(traceback.format_exc(), "debug")
- pass
def change_upstream_proxy_server(self, address):
# Make set_upstream_proxy_server always available,