From 394bd1d6b00719a12e36b3a6c8dac4b2b20e5ecf Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 15 Mar 2011 17:53:29 +1300 Subject: Interrupt interception when deleting an intercepting flow. Prompting the user for this is annoying. --- libmproxy/flow.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libmproxy/flow.py') 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[:]: -- cgit v1.2.3