diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-02-06 18:44:35 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-02-06 18:44:35 +1300 |
| commit | eb15ef7b80434b857aae33256851a3202d13e429 (patch) | |
| tree | 762db04676843406fc2418b9615ac72b0357b745 /libmproxy/flow.py | |
| parent | a4eaafab5a003298c8235f7502fb684da2220ca8 (diff) | |
| parent | b35cbc076058bf199ba0fd3db5be48dcccbf86f0 (diff) | |
| download | mitmproxy-eb15ef7b80434b857aae33256851a3202d13e429.tar.gz mitmproxy-eb15ef7b80434b857aae33256851a3202d13e429.tar.bz2 mitmproxy-eb15ef7b80434b857aae33256851a3202d13e429.zip | |
Merge remote branch 'hno/master'
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index ffcbed63..9596d416 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): |