From d9cc6f1dd6dfecdc4fe3ef38d2a7c5671f169c5e Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <matthias@urlichs.de>
Date: Fri, 28 Jun 2013 07:53:56 +0200
Subject: [PATCH] proxy.py: Catch channel.ask() returning None when terminating

---
 libmproxy/proxy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 69873a38d..8dfae77aa 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