diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-03 22:56:25 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-03 22:56:25 +1200 |
| commit | 837fcc65f53eb60b87987df445d150b4b362d3e9 (patch) | |
| tree | eae636b2ca2d147a0d5c1374d238a7fd5a3a726b /libmproxy/console/__init__.py | |
| parent | fe86194cc24039bd3efe1719f19edc1f2a41034f (diff) | |
| download | mitmproxy-837fcc65f53eb60b87987df445d150b4b362d3e9.tar.gz mitmproxy-837fcc65f53eb60b87987df445d150b4b362d3e9.tar.bz2 mitmproxy-837fcc65f53eb60b87987df445d150b4b362d3e9.zip | |
Make upstream-cert the default. There's now a --no-upstream-cert option to turn it off.
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 054cc66e..8574b93f 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -175,8 +175,8 @@ class StatusBar(common.WWrap): opts.append("norefresh") if self.master.killextra: opts.append("killextra") - if self.master.server.config.upstream_cert: - opts.append("upstream-cert") + if self.master.server.config.no_upstream_cert: + opts.append("no-upstream-cert") if opts: r.append("[%s]"%(":".join(opts))) @@ -859,7 +859,7 @@ class ConsoleMaster(flow.FlowMaster): ("anticomp", "c"), ("killextra", "k"), ("norefresh", "n"), - ("upstream-certs", "u"), + ("no-upstream-certs", "u"), ), self._change_options ) @@ -901,7 +901,7 @@ class ConsoleMaster(flow.FlowMaster): elif a == "n": self.refresh_server_playback = not self.refresh_server_playback elif a == "u": - self.server.config.upstream_cert = not self.server.config.upstream_cert + self.server.config.no_upstream_cert = not self.server.config.no_upstream_cert def shutdown(self): self.state.killall(self) |