From efe11a0782a668b4310849f7696cc89004d82f45 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 27 Jan 2011 13:32:24 +1300 Subject: Kill deadlock that sometimes occurred on shutdown. --- libmproxy/flow.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libmproxy/flow.py') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 8eb7342a..296b6738 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -78,14 +78,13 @@ class Flow: return isinstance(self.connection, ReplayConnection) def kill(self): - if self.intercepting: - if not self.request.acked: - self.request.kill = True - self.request.ack() - elif self.response and not self.response.acked: - self.response.kill = True - self.response.ack() - self.intercepting = False + if self.request and not self.request.acked: + self.request.kill = True + self.request.ack() + elif self.response and not self.response.acked: + self.response.kill = True + self.response.ack() + self.intercepting = False def intercept(self): self.intercepting = True -- cgit v1.2.3