diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-11-11 14:00:56 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-11-11 14:00:56 +1300 |
| commit | 5873516d991e5d04b565b93f95137e1cb2158aca (patch) | |
| tree | db911714493db7495909dcbeedf3c49f9b677970 /libmproxy/console | |
| parent | ec17e70d9e82bc6ae62300397b2f849c2d8dcc85 (diff) | |
| parent | 6f3b4eee3c3e30b391be457e38fb5ac67f8ef682 (diff) | |
| download | mitmproxy-5873516d991e5d04b565b93f95137e1cb2158aca.tar.gz mitmproxy-5873516d991e5d04b565b93f95137e1cb2158aca.tar.bz2 mitmproxy-5873516d991e5d04b565b93f95137e1cb2158aca.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/__init__.py | 3 | ||||
| -rw-r--r-- | libmproxy/console/flowlist.py | 6 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index ffd9eda8..fc6600c1 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -516,7 +516,8 @@ class ConsoleMaster(flow.FlowMaster): self.start_server_playback( ret, self.killextra, self.rheaders, - False, self.nopop + False, self.nopop, + self.options.replay_ignore_params, self.options.replay_ignore_content ) def spawn_editor(self, data): diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index e0330171..3eb4eb1a 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -120,13 +120,15 @@ class ConnectionItem(common.WWrap): self.master.start_server_playback( [i.copy() for i in self.master.state.view], self.master.killextra, self.master.rheaders, - False, self.master.nopop + False, self.master.nopop, + self.master.options.replay_ignore_params, self.master.options.replay_ignore_content ) elif k == "t": self.master.start_server_playback( [self.flow.copy()], self.master.killextra, self.master.rheaders, - False, self.master.nopop + False, self.master.nopop, + self.master.options.replay_ignore_params, self.master.options.replay_ignore_content ) else: self.master.path_prompt( diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index b2c46147..3dceff70 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -749,7 +749,7 @@ class FlowView(common.WWrap): self.master.statusbar.message("") elif key == "m": p = list(contentview.view_prompts) - p.insert(0, ("clear", "c")) + p.insert(0, ("Clear", "C")) self.master.prompt_onekey( "Display mode", p, |