Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-12-03 12:23:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'base/master'

Browse Source
This commit is contained in:
Marcelo Glezer 2015-02-05 10:34:26 -03:00
commit 5e2f440cdd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/console/__init__.py
View File

@ -423,6 +423,8 @@ class ConsoleMaster(flow.FlowMaster):
self.eventlog = options.eventlog self.eventlog = options.eventlog
self.eventlist = urwid.SimpleListWalker([]) self.eventlist = urwid.SimpleListWalker([])
self.statusbar = None
if options.client_replay: if options.client_replay:
self.client_playback_path(options.client_replay) self.client_playback_path(options.client_replay)

6
libmproxy/console/flowlist.py
View File

@ -121,14 +121,16 @@ class ConnectionItem(common.WWrap):
[i.copy() for i in self.master.state.view], [i.copy() for i in self.master.state.view],
self.master.killextra, self.master.rheaders, 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 self.master.options.replay_ignore_params, self.master.options.replay_ignore_content,
self.master.options.replay_ignore_payload_params
) )
elif k == "t": elif k == "t":
self.master.start_server_playback( self.master.start_server_playback(
[self.flow.copy()], [self.flow.copy()],
self.master.killextra, self.master.rheaders, 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 self.master.options.replay_ignore_params, self.master.options.replay_ignore_content,
self.master.options.replay_ignore_payload_params
) )
else: else:
self.master.path_prompt( self.master.path_prompt(