Merge remote branch 'hno/master'

2 files changed, 8 insertions, 7 deletions

diff --git a/libmproxy/controller.py b/libmproxy/controller.py
index ddfbe7f1..468092b7 100644
--- a/libmproxy/controller.py
+++ b/libmproxy/controller.py
@@ -23,15 +23,18 @@ class Msg:
         self.q = Queue.Queue()
         self.acked = False
 
-    def ack(self, data=None):
+    def ack(self, data=False):
         self.acked = True
-        self.q.put(data or self)
+        if data is None:
+            self.q.put(data)
+        else:
+            self.q.put(data or self)
 
     def send(self, masterq):
         self.acked = False
         try:
             masterq.put(self, timeout=3)
-            return self.q.get(timeout=3)
+            return self.q.get()
         except (Queue.Empty, Queue.Full):
             return None
 
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index ffcbed63..9596d416 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -153,11 +153,9 @@ class Flow:
 
     def kill(self):
         if self.request and not self.request.acked:
-            self.request.kill = True
-            self.request.ack()
+            self.request.ack(None)
         elif self.response and not self.response.acked:
-            self.response.kill = True
-            self.response.ack()
+            self.response.ack(None)
         self.intercepting = False
 
     def intercept(self):