kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-24 04:14:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor proxy.Server to fix a crash when replaying with -n

Browse Source
This commit is contained in:
Aldo Cortesi
2012-04-02 13:24:51 +12:00
parent f13e2213ea
commit c02fdb2463
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmproxy/console/__init__.py
View File

@@ -150,7 +150,7 @@ class StatusBar(common.WWrap):
r.append("[")
r.append(("heading_key", "u"))
r.append(":%s]"%self.master.stickyauth_txt)
if self.master.server and self.master.server.config.reverse_proxy:
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))
@@ -187,7 +187,7 @@ class StatusBar(common.WWrap):
t = [
('heading', ("[%s]"%self.master.state.flow_count()).ljust(7)),
]
if self.master.server:
if self.master.server.bound:
boundaddr = "[%s:%s]"%(self.master.server.address or "*", self.master.server.port)
else:
boundaddr = ""
@@ -510,9 +510,7 @@ class ConsoleMaster(flow.FlowMaster):
self.view_flowlist()
if self.server:
slave = controller.Slave(self.masterq, self.server)
slave.start()
self.server.start_slave(controller.Slave, self.masterq)
if self.options.rfile:
ret = self.load_flows(self.options.rfile)