Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into script

Browse Source
This commit is contained in:
Aldo Cortesi 2016-07-14 20:26:34 +12:00
commit 9f1c46e7d6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/web/master.py
View File

@ -94,6 +94,7 @@ class WebState(flow.State):
class Options(flow.options.Options): class Options(flow.options.Options):
def __init__( def __init__(
self, self,
intercept=False, # type: bool
wdebug=bool, # type: bool wdebug=bool, # type: bool
wport=8081, # type: int wport=8081, # type: int
wiface="127.0.0.1", # type: str wiface="127.0.0.1", # type: str
@ -108,6 +109,7 @@ class Options(flow.options.Options):
self.wauthenticator = wauthenticator self.wauthenticator = wauthenticator
self.wsingleuser = wsingleuser self.wsingleuser = wsingleuser
self.whtpasswd = whtpasswd self.whtpasswd = whtpasswd
self.intercept = intercept
super(Options, self).__init__(**kwargs) super(Options, self).__init__(**kwargs)
# TODO: This doesn't belong here. # TODO: This doesn't belong here.