From b35cbc076058bf199ba0fd3db5be48dcccbf86f0 Mon Sep 17 00:00:00 2001
From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 3 Feb 2011 23:39:28 +0100
Subject: Fix kill() again, got broken by the change to use None

---
 libmproxy/controller.py | 7 +++++--
 libmproxy/flow.py       | 6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'libmproxy')

diff --git a/libmproxy/controller.py b/libmproxy/controller.py
index ec1342de..468092b7 100644
--- a/libmproxy/controller.py
+++ b/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
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index e88b8f16..62965031 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):
-- 
cgit v1.2.3