diff options
| author | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:39:28 +0100 |
|---|---|---|
| committer | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:39:28 +0100 |
| commit | b35cbc076058bf199ba0fd3db5be48dcccbf86f0 (patch) | |
| tree | c77566045f067892a3503200f66cdbb1faeafbf6 /libmproxy | |
| parent | 5bf6482bd08d4eadda36b9b6f67fbf34016c603d (diff) | |
| download | mitmproxy-b35cbc076058bf199ba0fd3db5be48dcccbf86f0.tar.gz mitmproxy-b35cbc076058bf199ba0fd3db5be48dcccbf86f0.tar.bz2 mitmproxy-b35cbc076058bf199ba0fd3db5be48dcccbf86f0.zip | |
Fix kill() again, got broken by the change to use None
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/controller.py | 7 | ||||
| -rw-r--r-- | libmproxy/flow.py | 6 |
2 files changed, 7 insertions, 6 deletions
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): |