diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-31 22:29:13 +0200 |
commit | e9401a2123f416f8dd4c24bb4bbc74f297369133 (patch) | |
tree | afebf68d1091d487ef64083962992ea7b703a80e /libmproxy/console/__init__.py | |
parent | f5fb1138fdda77ec4a3bb5493479d2f56cdb0851 (diff) | |
parent | 3e3dbee936bb71e813d50937118eebff4ba23617 (diff) | |
download | mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.gz mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.tar.bz2 mitmproxy-e9401a2123f416f8dd4c24bb4bbc74f297369133.zip |
Merge branch 'stream'
Conflicts:
libmproxy/protocol/http.py
Diffstat (limited to 'libmproxy/console/__init__.py')
-rw-r--r-- | libmproxy/console/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index e660f312..3d025739 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -165,6 +165,8 @@ class StatusBar(common.WWrap): opts.append("no-upstream-cert") if self.master.state.follow_focus: opts.append("following") + if self.master.stream_large_bodies: + opts.append("stream:%s" % utils.pretty_size(self.master.stream_large_bodies.max_size)) if opts: r.append("[%s]"%(":".join(opts))) @@ -343,6 +345,7 @@ class Options(object): "server_replay", "stickycookie", "stickyauth", + "stream_large_bodies", "verbosity", "wfile", "nopop", @@ -391,6 +394,8 @@ class ConsoleMaster(flow.FlowMaster): print >> sys.stderr, "Sticky auth error:", r sys.exit(1) + self.set_stream_large_bodies(options.stream_large_bodies) + self.refresh_server_playback = options.refresh_server_playback self.anticache = options.anticache self.anticomp = options.anticomp |