aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
diff options
context:
space:
mode:
authorMatthias Urlichs <matthias@urlichs.de>2013-06-28 07:53:56 +0200
committerMatthias Urlichs <matthias@urlichs.de>2013-06-28 07:53:56 +0200
commitd9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e (patch)
tree55cebd69efd700ce18f7d6613056dddcc8a2df37 /libmproxy/proxy.py
parentbe1377850ed85506a1b0fb4eeca2bd686cdc4b71 (diff)
downloadmitmproxy-d9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e.tar.gz
mitmproxy-d9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e.tar.bz2
mitmproxy-d9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e.zip
proxy.py: Catch channel.ask() returning None when terminating
Diffstat (limited to 'libmproxy/proxy.py')
-rw-r--r--libmproxy/proxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 69873a38..8dfae77a 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -216,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