diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 20:26:34 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 20:26:34 +1200 |
| commit | 9f1c46e7d69ab96790f34fc6d52f246bb9bfdfdc (patch) | |
| tree | 6a8bebd39b4050370866fb4278bd47dcde39661b | |
| parent | 698af945a49ef34e909f1f5dc1f12552f9e3680b (diff) | |
| parent | e051928f26afbc58c01d7854b62f8bfb0d4ed5ee (diff) | |
| download | mitmproxy-9f1c46e7d69ab96790f34fc6d52f246bb9bfdfdc.tar.gz mitmproxy-9f1c46e7d69ab96790f34fc6d52f246bb9bfdfdc.tar.bz2 mitmproxy-9f1c46e7d69ab96790f34fc6d52f246bb9bfdfdc.zip | |
Merge branch 'master' into script
| -rw-r--r-- | mitmproxy/web/master.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mitmproxy/web/master.py b/mitmproxy/web/master.py index 75cc7746..adfc23c4 100644 --- a/mitmproxy/web/master.py +++ b/mitmproxy/web/master.py @@ -94,6 +94,7 @@ class WebState(flow.State): class Options(flow.options.Options): def __init__( self, + intercept=False, # type: bool wdebug=bool, # type: bool wport=8081, # type: int wiface="127.0.0.1", # type: str @@ -108,6 +109,7 @@ class Options(flow.options.Options): self.wauthenticator = wauthenticator self.wsingleuser = wsingleuser self.whtpasswd = whtpasswd + self.intercept = intercept super(Options, self).__init__(**kwargs) # TODO: This doesn't belong here. |