diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-09-06 18:48:03 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-09-06 23:48:02 +1200 |
commit | 9abdd3a8d9189ca300221e5acde4a8190804abd7 (patch) | |
tree | c9d335497687c169bdc1c0d8e331a34d74e56712 /mitmproxy/dump.py | |
parent | c76d83f749079b88a2b7b7a76545a7d571ed96a5 (diff) | |
download | mitmproxy-9abdd3a8d9189ca300221e5acde4a8190804abd7.tar.gz mitmproxy-9abdd3a8d9189ca300221e5acde4a8190804abd7.tar.bz2 mitmproxy-9abdd3a8d9189ca300221e5acde4a8190804abd7.zip |
Move server playback in to an addon
- Move server playback into an addon
- Implement a better sync strategy to decide when to exit if keepserving is
off. We now wait for the final flow played back to no longer be live.
- Leave interactive server playback in mitmproxy console broken for now - there
are broader addon-related changes that need to be made for that, and this patch
is already big.
Fixes #1229
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r-- | mitmproxy/dump.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py index 51124224..49215b3a 100644 --- a/mitmproxy/dump.py +++ b/mitmproxy/dump.py @@ -59,18 +59,6 @@ class DumpMaster(flow.FlowMaster): "HTTP/2 is disabled. Use --no-http2 to silence this warning.", file=sys.stderr) - if options.server_replay: - self.start_server_playback( - self._readflow(options.server_replay), - options.kill, options.rheaders, - not options.keepserving, - options.nopop, - options.replay_ignore_params, - options.replay_ignore_content, - options.replay_ignore_payload_params, - options.replay_ignore_host - ) - if options.client_replay: self.start_client_playback( self._readflow(options.client_replay), |