diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 10:34:26 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 10:34:26 -0300 |
| commit | 5e2f440cdd860ee74696b0db639c6baf87dd945a (patch) | |
| tree | 8414b527267002c1bdfe04bffd1a58ce539a3b89 | |
| parent | 4f578866fac9e8261ad659d9a04c87822d7c9aab (diff) | |
| parent | 965cfffa5ec5bb2b395a8445027e5020272a18ed (diff) | |
| download | mitmproxy-5e2f440cdd860ee74696b0db639c6baf87dd945a.tar.gz mitmproxy-5e2f440cdd860ee74696b0db639c6baf87dd945a.tar.bz2 mitmproxy-5e2f440cdd860ee74696b0db639c6baf87dd945a.zip | |
Merge remote-tracking branch 'base/master'
| -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 559c78d4..6aabf5ed 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 c896ba33..102fa7b9 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -121,14 +121,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( |