kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-28 20:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1860 from cortesi/smokey

Browse Source 
Catch occasional protocol errors in regular connect
This commit is contained in:
Maximilian Hils
2016-12-16 00:16:34 +01:00
committed by GitHub
parent 6b5673e849 61e552553c
commit e769b1fa9a
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mitmproxy/proxy/protocol/http.py
View File

@@ -182,6 +182,17 @@ class HttpLayer(base.Layer):
try:
self.set_server((f.request.host, f.request.port))
if f.response:
resp = f.response
else:
resp = http.make_connect_response(f.request.data.http_version)
self.send_response(resp)
if is_ok(resp.status_code):
layer = self.ctx.next_layer(self)
layer()
except (
exceptions.ProtocolException, exceptions.NetlibException
) as e:
@@ -192,17 +203,6 @@ class HttpLayer(base.Layer):
self.channel.ask("error", f)
return False
if f.response:
resp = f.response
else:
resp = http.make_connect_response(f.request.data.http_version)
self.send_response(resp)
if is_ok(resp.status_code):
layer = self.ctx.next_layer(self)
layer()
return False
def handle_upstream_connect(self, f):