aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy/server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-08-12 02:55:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-08-12 02:55:32 +0200
commitda3e7c0187e7baaf94359ae428461787df52c19f (patch)
tree122e345ccf707626c5f814230c2e814ab4ed9ac8 /libmproxy/proxy/server.py
parente546af2d334c9afd1f4518dcfc1c2aeb6f7a1dd0 (diff)
downloadmitmproxy-da3e7c0187e7baaf94359ae428461787df52c19f.tar.gz
mitmproxy-da3e7c0187e7baaf94359ae428461787df52c19f.tar.bz2
mitmproxy-da3e7c0187e7baaf94359ae428461787df52c19f.zip
do not connect if inline script already connected to upstream server
Diffstat (limited to 'libmproxy/proxy/server.py')
-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 d4a97e6a..02b86d71 100644
--- a/libmproxy/proxy/server.py
+++ b/libmproxy/proxy/server.py
@@ -85,7 +85,7 @@ class ConnectionHandler:
self.determine_conntype()
self.channel.ask("clientconnect", self)
- if self.server_conn:
+ if self.server_conn and not self.server_conn.connection:
self.establish_server_connection()
if client_ssl or server_ssl:
self.establish_ssl(client=client_ssl, server=server_ssl)