diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-15 17:53:29 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-15 17:53:29 +1300 |
| commit | 394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf (patch) | |
| tree | 2a52393abb5c2e7a86d04b9222f3bcf2ccadeedd /libmproxy/flow.py | |
| parent | e3ad3790dec1105824fa793ae9f7c927b6f81021 (diff) | |
| download | mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.tar.gz mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.tar.bz2 mitmproxy-394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf.zip | |
Interrupt interception when deleting an intercepting flow.
Prompting the user for this is annoying.
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 21d4017a..62fba6ab 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -293,8 +293,8 @@ class Flow: self.request.ack(None) elif self.response and not self.response.acked: self.response.ack(None) - self.intercepting = False master.handle_error(self.error) + self.intercepting = False def intercept(self): self.intercepting = True @@ -403,12 +403,10 @@ class State: return tuple(self.flow_list[:]) def delete_flow(self, f): - if not f.intercepting: - if f.request in self.flow_map: - del self.flow_map[f.request] - self.flow_list.remove(f) - return True - return False + if f.request in self.flow_map: + del self.flow_map[f.request] + self.flow_list.remove(f) + return True def clear(self): for i in self.flow_list[:]: |