diff options
| author | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:28:24 +0100 |
|---|---|---|
| committer | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:28:24 +0100 |
| commit | 2f813fa74818bcaaca8b0182eda004ea91a0d504 (patch) | |
| tree | 36f798117ecb0f56303bc5a00fa6a152053e2891 /libmproxy | |
| parent | 7924f0797114dffb6224febc0a533dba8c500c40 (diff) | |
| download | mitmproxy-2f813fa74818bcaaca8b0182eda004ea91a0d504.tar.gz mitmproxy-2f813fa74818bcaaca8b0182eda004ea91a0d504.tar.bz2 mitmproxy-2f813fa74818bcaaca8b0182eda004ea91a0d504.zip | |
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.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/controller.py | 2 |
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 |