From 2f813fa74818bcaaca8b0182eda004ea91a0d504 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Thu, 3 Feb 2011 23:28:24 +0100 Subject: Messages may need to stay in the controller for considerable amount of time. Don't use a timeout waiting for the controller response. Example where this happens is intercepted flows. --- libmproxy/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmproxy/controller.py') diff --git a/libmproxy/controller.py b/libmproxy/controller.py index ddfbe7f1..ec1342de 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -31,7 +31,7 @@ class Msg: 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 -- cgit v1.2.3 From b35cbc076058bf199ba0fd3db5be48dcccbf86f0 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom 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 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libmproxy/controller.py') 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 -- cgit v1.2.3