diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-07-01 17:36:33 -0700 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-07-01 17:36:33 -0700 |
| commit | 1f029306d65b8d9d7e3dd5c81169d6a6dba3ab8e (patch) | |
| tree | 55cebd69efd700ce18f7d6613056dddcc8a2df37 /libmproxy/proxy.py | |
| parent | 826a1fdaa264a0dfaafe238fec96170c699ca7ae (diff) | |
| parent | d9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e (diff) | |
| download | mitmproxy-1f029306d65b8d9d7e3dd5c81169d6a6dba3ab8e.tar.gz mitmproxy-1f029306d65b8d9d7e3dd5c81169d6a6dba3ab8e.tar.bz2 mitmproxy-1f029306d65b8d9d7e3dd5c81169d6a6dba3ab8e.zip | |
Merge pull request #139 from smurfix/fixes
Close connection when flush fails
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 283072ab..8dfae77a 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -88,6 +88,9 @@ class ServerConnection(tcp.TCPClient): def terminate(self): try: self.wfile.flush() + except IOError: + pass + try: self.connection.close() except IOError: pass @@ -213,7 +216,7 @@ class ProxyHandler(tcp.BaseHandler): return else: request_reply = self.channel.ask(request) - if request_reply == KILL: + if request_reply is None or request_reply == KILL: return elif isinstance(request_reply, flow.Response): request = False |