aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorEli Shvartsman <eli@shvar.com>2014-04-29 12:41:59 +0300
committerEli Shvartsman <eli@shvar.com>2014-04-29 12:41:59 +0300
commited91e19e0be45720b942cfdad7e53076b5ac6543 (patch)
tree5eb51f0bf8aa4c7970ea7ffe9b36f8c3de8d7a7d /libmproxy
parent1dba379ae90593a563acb9dbed6f5e6b721c086a (diff)
downloadmitmproxy-ed91e19e0be45720b942cfdad7e53076b5ac6543.tar.gz
mitmproxy-ed91e19e0be45720b942cfdad7e53076b5ac6543.tar.bz2
mitmproxy-ed91e19e0be45720b942cfdad7e53076b5ac6543.zip
Update server.py
We should ask for upstream cert only if there is: 1) no no_upstream_cert option specified 2) ssl connection to server is established
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/proxy/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py
index 2252f674..c5b99fee 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -226,7 +226,7 @@ class ConnectionHandler:
else:
host = self.server_conn.address.host
sans = []
- if not self.config.no_upstream_cert or not self.server_conn.ssl_established:
+ if not self.config.no_upstream_cert and self.server_conn.ssl_established:
upstream_cert = self.server_conn.cert
if upstream_cert.cn:
host = upstream_cert.cn.decode("utf8").encode("idna")