diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-13 16:50:11 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-13 16:50:11 +1300 |
| commit | 324d7c3955bef29745183949baed48ee286c126d (patch) | |
| tree | 1b5d72fd1a1f3e8befbe00e17bc602e69117ba71 /libmproxy/flow.py | |
| parent | 49c1532af76594338ffbd12e4daaed9501471f6f (diff) | |
| download | mitmproxy-324d7c3955bef29745183949baed48ee286c126d.tar.gz mitmproxy-324d7c3955bef29745183949baed48ee286c126d.tar.bz2 mitmproxy-324d7c3955bef29745183949baed48ee286c126d.zip | |
Add client plaback to mitmproxy.
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 3764fc95..fb5c82d7 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -287,13 +287,14 @@ class Flow: return pattern(self.request) return False - def kill(self): + def kill(self, master): self.error = proxy.Error(self.request, "Connection killed") if self.request and not self.request.acked: self.request.ack(None) elif self.response and not self.response.acked: self.response.ack(None) self.intercepting = False + master.handle_error(self.error) def intercept(self): self.intercepting = True @@ -552,8 +553,7 @@ class FlowMaster(controller.Master): pb = self.do_server_playback(f) if not pb: if self.kill_nonreplay: - f.kill() - self.handle_error(f.error) + f.kill(self) else: r.ack() return f |