aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/cmdline.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-06-02 10:45:17 +1200
committerAldo Cortesi <aldo@nullcube.com>2011-06-02 10:45:17 +1200
commit62f9864395fcb9933992257d5beabf84e532f85f (patch)
treeafe048a485913801fd04f8e0baf9678234cedfcc /libmproxy/cmdline.py
parent1de5209340cf0f032a93244bee1696abbb879154 (diff)
parent07110bbbf192339b52d1067b531d0cea20b245d2 (diff)
downloadmitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.tar.gz
mitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.tar.bz2
mitmproxy-62f9864395fcb9933992257d5beabf84e532f85f.zip
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'libmproxy/cmdline.py')
-rw-r--r--libmproxy/cmdline.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py
index 222defeb..ce68baed 100644
--- a/libmproxy/cmdline.py
+++ b/libmproxy/cmdline.py
@@ -21,6 +21,7 @@ def get_common_options(options):
no_server = options.no_server,
refresh_server_playback = not options.norefresh,
rheaders = options.rheaders,
+ rfile = options.rfile,
request_script = options.request_script,
response_script = options.response_script,
server_replay = options.server_replay,
@@ -58,6 +59,11 @@ def common_options(parser):
help="Quiet."
)
parser.add_option(
+ "-r",
+ action="store", dest="rfile", default=None,
+ help="Read flows from file."
+ )
+ parser.add_option(
"--anticache",
action="store_true", dest="anticache", default=False,
help="Strip out request headers that might cause the server to return 304-not-modified."