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

fix comments

Browse Source
This commit is contained in:
Maximilian Hils
2014-02-09 02:54:07 +01:00
parent a85974eaa8
commit d9a6037299
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/flow.py
View File

@@ -467,7 +467,7 @@ class FlowMaster(controller.Master):
flask.request.environ.get('werkzeug.server.shutdown')()
# Workaround: Monkey-patch shutdown function to stop the app.
# Improve this when we switch flask werkzeug for something useful.
# Improve this when we switch werkzeugs http server for something useful.
_shutdown = self.shutdown
def _shutdownwrap():
_shutdown()

11
libmproxy/protocol/http.py
View File

@@ -975,6 +975,12 @@ class HTTPHandler(ProtocolHandler, TemporaryServerChangeMixin):
self.c.client_conn.wfile.flush()
def hook_reconnect(self, upstream_request):
"""
If the authority request has been forwarded upstream (because we have another proxy server there),
money-patch the ConnectionHandler.server_reconnect function to resend the CONNECT request on reconnect.
Hooking code isn't particulary beautiful, but it isolates this edge-case from
the protocol-agnostic ConnectionHandler
"""
self.c.log("Hook reconnect function")
original_reconnect_func = self.c.server_reconnect
@@ -997,11 +1003,6 @@ class HTTPHandler(ProtocolHandler, TemporaryServerChangeMixin):
def ssl_upgrade(self):
"""
Upgrade the connection to SSL after an authority (CONNECT) request has been made.
If the authority request has been forwarded upstream (because we have another proxy server there),
money-patch the ConnectionHandler.server_reconnect function to resend the request on reconnect.
This isn't particular beautiful code, but it isolates this rare edge-case from the
protocol-agnostic ConnectionHandler
"""
self.c.log("Received CONNECT request. Upgrading to SSL...")
self.c.mode = "transparent"