diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-08-30 20:15:19 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-08-30 20:15:19 +0200 |
commit | 1f47f7b6b29cd1229264edf75194652824d94705 (patch) | |
tree | 4b52337daddbc97aa40b80ea84e795cf7448be9b /libmproxy/protocol/tcp.py | |
parent | 82730c1c6ff4a1e593de48309d02de2b49cade5d (diff) | |
download | mitmproxy-1f47f7b6b29cd1229264edf75194652824d94705.tar.gz mitmproxy-1f47f7b6b29cd1229264edf75194652824d94705.tar.bz2 mitmproxy-1f47f7b6b29cd1229264edf75194652824d94705.zip |
refactor protocol handling, fix #332
Diffstat (limited to 'libmproxy/protocol/tcp.py')
-rw-r--r-- | libmproxy/protocol/tcp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py index a77a9096..00dbf4b3 100644 --- a/libmproxy/protocol/tcp.py +++ b/libmproxy/protocol/tcp.py @@ -18,7 +18,7 @@ class TCPHandler(ProtocolHandler): buf = memoryview(bytearray(self.chunk_size)) conns = [self.c.client_conn.rfile, self.c.server_conn.rfile] - while not self.c.close: + while True: r, _, _ = select.select(conns, [], [], 10) for rfile in r: if self.c.client_conn.rfile == rfile: @@ -51,7 +51,7 @@ class TCPHandler(ProtocolHandler): dst.connection.shutdown(socket.SHUT_WR) if len(conns) == 0: - self.c.close = True + return continue if src.ssl_established or dst.ssl_established: |