Merge remote-tracking branch 'origin/master'

1 files changed, 11 insertions, 3 deletions

diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index a394d7f3..fc054b5e 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -1,6 +1,8 @@
 import proxy
 import re, filt
 import argparse
+import shlex
+import os
 
 APP_DOMAIN = "mitm"
 APP_IP = "1.1.1.1"
@@ -143,7 +145,7 @@ def get_common_options(options):
         replacements = reps,
         setheaders = setheaders,
         server_replay = options.server_replay,
-        script = options.script,
+        scripts = options.scripts,
         stickycookie = stickycookie,
         stickyauth = stickyauth,
         showhost = options.showhost,
@@ -190,6 +192,11 @@ def common_options(parser):
         help="Reverse proxy to upstream server: http[s]://host[:port]"
     )
     parser.add_argument(
+        "-F",
+        action="store", dest="forward_proxy", default=None,
+        help="Proxy to unconditionally forward to: http[s]://host[:port]"
+    )
+    parser.add_argument(
         "-q",
         action="store_true", dest="quiet",
         help="Quiet."
@@ -201,8 +208,9 @@ def common_options(parser):
     )
     parser.add_argument(
         "-s",
-        action="store", dest="script", default=None,
-        help="Run a script."
+        action="append", type=lambda x: shlex.split(x,posix=(os.name != "nt")), dest="scripts", default=[],
+        metavar='"script.py --bar"',
+        help="Run a script. Surround with quotes to pass script arguments. Can be passed multiple times."
     )
     parser.add_argument(
         "-t",