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

Merge pull request #548 from macmantrl/no_serverconn

Browse Source 
Prevent unnecessary upstream server connects
This commit is contained in:
Maximilian Hils
2015-07-26 11:58:21 +02:00
parent ee163ed5b0 4c50c36345
commit d2ae6b630e
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libmproxy/protocol/http.py
View File

@@ -1314,7 +1314,6 @@ class HTTPHandler(ProtocolHandler):
self.c.set_server_address((request.host, request.port))
# Update server_conn attribute on the flow
flow.server_conn = self.c.server_conn
self.c.establish_server_connection()
self.c.client_conn.send(
('HTTP/%s.%s 200 ' % (request.httpversion[0], request.httpversion[1])) +
'Connection established\r\n' +
@@ -1518,7 +1517,10 @@ class HTTPHandler(ProtocolHandler):
"Received CONNECT request to SSL port. "
"Upgrading to SSL...", "debug"
)
self.c.establish_ssl(server=True, client=True)
server_ssl = not self.c.config.no_upstream_cert
if server_ssl:
self.c.establish_server_connection()
self.c.establish_ssl(server=server_ssl, client=True)
self.c.log("Upgrade to SSL completed.", "debug")
if self.c.config.check_tcp(address):

2
libmproxy/protocol/primitives.py
View File

@@ -236,7 +236,7 @@ class LiveConnection(object):
ssl_mismatch = (
ssl is not None and
(
ssl != self.c.server_conn.ssl_established
(self.c.server_conn.connection and ssl != self.c.server_conn.ssl_established)
or
(sni is not None and sni != self.c.server_conn.sni)
)