diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 19:38:02 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 19:38:02 +0100 |
commit | 28f82d052dc35c9dcb0cdcc393728e5cfca1df34 (patch) | |
tree | 04e608396dd426af93143cf8ac0a5af3bc07a34c /libmproxy/console | |
parent | d5cfc1c080e2736afb478a310afe525ab493a72f (diff) | |
download | mitmproxy-28f82d052dc35c9dcb0cdcc393728e5cfca1df34.tar.gz mitmproxy-28f82d052dc35c9dcb0cdcc393728e5cfca1df34.tar.bz2 mitmproxy-28f82d052dc35c9dcb0cdcc393728e5cfca1df34.zip |
fix display bugs (fixes #243)
Diffstat (limited to 'libmproxy/console')
-rw-r--r-- | libmproxy/console/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 83145f66..c1ef4331 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -171,7 +171,11 @@ class StatusBar(common.WWrap): if self.master.server.config.get_upstream_server and \ isinstance(self.master.server.config.get_upstream_server, proxy.ConstUpstreamServerResolver): - r.append("[dest:%s]"%utils.unparse_url(*self.master.server.config.get_upstream_server.dst)) + dst = self.master.server.config.get_upstream_server.dst + scheme = "https" if dst[0] else "http" + if dst[1] != dst[0]: + scheme += "2https" if dst[1] else "http" + r.append("[dest:%s]"%utils.unparse_url(scheme, *self.master.server.config.get_upstream_server.dst[2:])) if self.master.scripts: r.append("[scripts:%s]"%len(self.master.scripts)) # r.append("[lt:%0.3f]"%self.master.looptime) @@ -646,7 +650,6 @@ class ConsoleMaster(flow.FlowMaster): self.statusbar = StatusBar(self, flowview.footer) self.state.set_focus_flow(flow) self.state.view_mode = common.VIEW_FLOW - self.make_view() self.help_context = flowview.help_context |