aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/controller.py
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy/controller.py')
-rw-r--r--libmproxy/controller.py2
1 files changed, 1 insertions, 1 deletions
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