Merge remote-tracking branch 'onlywade/master'

Conflicts:
	libmproxy/console/__init__.py
	libmproxy/console/flowlist.py

1 files changed, 7 insertions, 1 deletions

diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 2b8ca7cf..ece476f2 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -192,7 +192,8 @@ def get_common_options(options):
         nopop=options.nopop,
         replay_ignore_content = options.replay_ignore_content,
         replay_ignore_params = options.replay_ignore_params,
-        replay_ignore_payload_params = options.replay_ignore_payload_params
+        replay_ignore_payload_params = options.replay_ignore_payload_params,
+        replay_ignore_host = options.replay_ignore_host
     )
 
 
@@ -479,6 +480,11 @@ def common_options(parser):
             to replay. Can be passed multiple times.
         """
     )
+    group.add_argument(
+        "--replay-ignore-host",
+        action="store_true", dest="replay_ignore_host", default=False,
+        help="Ignore request's destination host while searching for a saved flow to replay"
+    )
 
     group = parser.add_argument_group(
         "Replacements",