diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 17:02:09 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-10 17:02:09 +0100 |
| commit | b59013f6e3d80fa6bbf5640f2652559457f07d0e (patch) | |
| tree | bba552a4d7f089dc422df2aff2a9095153118311 /libmproxy/console/__init__.py | |
| parent | 982da23e9a219d055c2137f56b885c06006ca098 (diff) | |
| parent | 9cc10630c8e0b0f249ed852299d3316ba42f128d (diff) | |
| download | mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.gz mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.tar.bz2 mitmproxy-b59013f6e3d80fa6bbf5640f2652559457f07d0e.zip | |
Merge branch 'absolutely_relative_proxying'
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 4a58e771..846abba7 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -144,10 +144,6 @@ class StatusBar(common.WWrap): r.append("[") r.append(("heading_key", "u")) r.append(":%s]"%self.master.stickyauth_txt) - if self.master.server.config.reverse_proxy: - r.append("[") - r.append(("heading_key", "P")) - r.append(":%s]"%utils.unparse_url(*self.master.server.config.reverse_proxy)) if self.master.state.default_body_view.name != "Auto": r.append("[") r.append(("heading_key", "M")) @@ -172,6 +168,8 @@ class StatusBar(common.WWrap): if opts: r.append("[%s]"%(":".join(opts))) + if self.master.server.config.upstream_server: + r.append("[dest:%s]"%utils.unparse_url(*self.master.server.config.upstream_server)) if self.master.scripts: r.append("[scripts:%s]"%len(self.master.scripts)) if self.master.debug: @@ -763,15 +761,6 @@ class ConsoleMaster(flow.FlowMaster): self.state.default_body_view = v self.refresh_focus() - def set_reverse_proxy(self, txt): - if not txt: - self.server.config.reverse_proxy = None - else: - s = utils.parse_proxy_spec(txt) - if not s: - return "Invalid reverse proxy specification" - self.server.config.reverse_proxy = s - def drawscreen(self): size = self.ui.get_cols_rows() canvas = self.view.render(size, focus=1) @@ -866,16 +855,6 @@ class ConsoleMaster(flow.FlowMaster): contentview.view_prompts, self.change_default_display_mode ) - elif k == "P": - if self.server.config.reverse_proxy: - p = utils.unparse_url(*self.server.config.reverse_proxy) - else: - p = "" - self.prompt( - "Reverse proxy: ", - p, - self.set_reverse_proxy - ) elif k == "R": self.view_grideditor( grideditor.ReplaceEditor( |