diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-04-29 12:49:53 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-04-29 12:49:53 +0200 |
| commit | e15b97372b57dfa33e5f7d4fb41503532520374e (patch) | |
| tree | 5eb51f0bf8aa4c7970ea7ffe9b36f8c3de8d7a7d | |
| parent | 1dba379ae90593a563acb9dbed6f5e6b721c086a (diff) | |
| parent | ed91e19e0be45720b942cfdad7e53076b5ac6543 (diff) | |
| download | mitmproxy-e15b97372b57dfa33e5f7d4fb41503532520374e.tar.gz mitmproxy-e15b97372b57dfa33e5f7d4fb41503532520374e.tar.bz2 mitmproxy-e15b97372b57dfa33e5f7d4fb41503532520374e.zip | |
Merge pull request #268 from shvar/patch-1
Fix upstream_cert call in case of https2http
| -rw-r--r-- | libmproxy/proxy/server.py | 2 |
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") |