diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-11 13:06:51 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-11 13:06:51 +1300 |
commit | 7d85db0da31186a5a80d3a925ab6382f6e5b42f9 (patch) | |
tree | 75b1066678711c1f72d878b90eb79e55850c1c61 /libmproxy/flow.py | |
parent | daa9653ebebe73e1056d6dae14b11b0842ecbc2a (diff) | |
download | mitmproxy-7d85db0da31186a5a80d3a925ab6382f6e5b42f9.tar.gz mitmproxy-7d85db0da31186a5a80d3a925ab6382f6e5b42f9.tar.bz2 mitmproxy-7d85db0da31186a5a80d3a925ab6382f6e5b42f9.zip |
Display Errors and killed connections in mitmdump.
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r-- | libmproxy/flow.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index e5f9c35f..60a6ebd2 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -288,6 +288,7 @@ class Flow: return False def kill(self): + 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: @@ -399,10 +400,6 @@ class State: for i in self.flow_list[:]: i.accept_intercept() - def kill_flow(self, f): - f.kill() - self.delete_flow(f) - def revert(self, f): f.revert() @@ -534,7 +531,8 @@ class FlowMaster(controller.Master): pb = self.do_server_playback(f) if not pb: if self.kill_nonreplay: - self.state.kill_flow(f) + f.kill() + self.handle_error(f.error) else: r.ack() return f |