Fix kill() again, got broken by the change to use None

libmproxy/controller.py

@@ -23,9 +23,12 @@ 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

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):