diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-07-26 11:58:21 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-07-26 11:58:21 +0200 |
| commit | d2ae6b630e7924479aefbb9f0193fdfcbae8fea6 (patch) | |
| tree | 86714c62c80155613882fae31930cbfd2ac5baac /libmproxy/protocol/primitives.py | |
| parent | ee163ed5b0d69a42476751e885ef9548bb6da1d9 (diff) | |
| parent | 4c50c36345761f2b012c52bff230bdc5347f3d66 (diff) | |
| download | mitmproxy-d2ae6b630e7924479aefbb9f0193fdfcbae8fea6.tar.gz mitmproxy-d2ae6b630e7924479aefbb9f0193fdfcbae8fea6.tar.bz2 mitmproxy-d2ae6b630e7924479aefbb9f0193fdfcbae8fea6.zip | |
Merge pull request #548 from macmantrl/no_serverconn
Prevent unnecessary upstream server connects
Diffstat (limited to 'libmproxy/protocol/primitives.py')
| -rw-r--r-- | libmproxy/protocol/primitives.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 2f8ea3e0..a9193c5f 100644 --- a/libmproxy/protocol/primitives.py +++ b/libmproxy/protocol/primitives.py @@ -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) ) |