diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-15 14:36:06 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-15 14:36:06 +0100 |
| commit | 3650d7366216e4cdde0fa369e58b681c9bc30236 (patch) | |
| tree | f2b23eb1d2680e90784c129b443d55f6f24bd0c9 /libmproxy/console/__init__.py | |
| parent | 47091c8db5172b3394b2a8f8d958ba50724f3311 (diff) | |
| parent | 803d631f04f6af5bb54bbb46b3efec39622ca216 (diff) | |
| download | mitmproxy-3650d7366216e4cdde0fa369e58b681c9bc30236.tar.gz mitmproxy-3650d7366216e4cdde0fa369e58b681c9bc30236.tar.bz2 mitmproxy-3650d7366216e4cdde0fa369e58b681c9bc30236.zip | |
Merge remote-tracking branch 'onlywade/master'
Conflicts:
libmproxy/console/__init__.py
libmproxy/console/flowlist.py
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 627c6d18..70bd46d3 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -539,7 +539,8 @@ class ConsoleMaster(flow.FlowMaster): False, self.nopop, self.options.replay_ignore_params, self.options.replay_ignore_content, - self.options.replay_ignore_payload_params + self.options.replay_ignore_payload_params, + self.options.replay_ignore_host ) def spawn_editor(self, data): |