diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-28 12:38:07 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-28 12:38:07 +1200 |
| commit | f4813d56492a32ef7856002c8be25cf7012bab4e (patch) | |
| tree | e429d446d25e784db9dadd358c006fea43814e61 /mitmproxy/flow.py | |
| parent | f29f6210bbc725da997b32ecd6e666899df3b0cd (diff) | |
| download | mitmproxy-f4813d56492a32ef7856002c8be25cf7012bab4e.tar.gz mitmproxy-f4813d56492a32ef7856002c8be25cf7012bab4e.tar.bz2 mitmproxy-f4813d56492a32ef7856002c8be25cf7012bab4e.zip | |
Make @controller.handler inheritance-friendly
Use this to adapt mitmweb and mitproxy console
Diffstat (limited to 'mitmproxy/flow.py')
| -rw-r--r-- | mitmproxy/flow.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/flow.py b/mitmproxy/flow.py index 2a324993..ba8dec5d 100644 --- a/mitmproxy/flow.py +++ b/mitmproxy/flow.py @@ -546,7 +546,8 @@ class FlowStore(FlowList): def kill_all(self, master): for f in self._list: - f.kill(master) + if not f.reply.acked: + f.kill(master) class State(object): |