diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 10:36:30 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 10:36:30 -0300 |
| commit | a86446e2040aa0daadb80b63a33f6af204a2b64d (patch) | |
| tree | 108afd2e3d1a4641cf585cece273c71b2e2e47aa | |
| parent | 82d8c93261c6efe8314e68a34070ce960f308972 (diff) | |
| parent | 965cfffa5ec5bb2b395a8445027e5020272a18ed (diff) | |
| download | mitmproxy-a86446e2040aa0daadb80b63a33f6af204a2b64d.tar.gz mitmproxy-a86446e2040aa0daadb80b63a33f6af204a2b64d.tar.bz2 mitmproxy-a86446e2040aa0daadb80b63a33f6af204a2b64d.zip | |
Merge remote-tracking branch 'base/master' into feature-334
| -rw-r--r-- | libmproxy/console/__init__.py | 2 | ||||
| -rw-r--r-- | libmproxy/console/flowlist.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 6fd83141..dc20d21f 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -423,6 +423,8 @@ class ConsoleMaster(flow.FlowMaster): self.eventlog = options.eventlog self.eventlist = urwid.SimpleListWalker([]) + self.statusbar = None + if options.client_replay: self.client_playback_path(options.client_replay) diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index fa430fdd..fbcf1052 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -124,14 +124,16 @@ class ConnectionItem(common.WWrap): [i.copy() for i in self.master.state.view], self.master.killextra, self.master.rheaders, False, self.master.nopop, - self.master.options.replay_ignore_params, self.master.options.replay_ignore_content + self.master.options.replay_ignore_params, self.master.options.replay_ignore_content, + self.master.options.replay_ignore_payload_params ) elif k == "t": self.master.start_server_playback( [self.flow.copy()], self.master.killextra, self.master.rheaders, False, self.master.nopop, - self.master.options.replay_ignore_params, self.master.options.replay_ignore_content + self.master.options.replay_ignore_params, self.master.options.replay_ignore_content, + self.master.options.replay_ignore_payload_params ) else: self.master.path_prompt( |