diff options
| author | smill <smill@cuckoo.sh> | 2016-09-14 19:11:57 +0000 |
|---|---|---|
| committer | smill <smill@cuckoo.sh> | 2016-09-14 19:11:57 +0000 |
| commit | 83a28021ad863d0ced37594df68c5b97381910f1 (patch) | |
| tree | a8aa26f8d9634e837fcd437e324b030ea5abc400 | |
| parent | 9429f1bc7b33846c71d7c06f92506a4fc4c68049 (diff) | |
| download | mitmproxy-83a28021ad863d0ced37594df68c5b97381910f1.tar.gz mitmproxy-83a28021ad863d0ced37594df68c5b97381910f1.tar.bz2 mitmproxy-83a28021ad863d0ced37594df68c5b97381910f1.zip | |
Fixed travis-ci issues.
| -rw-r--r-- | mitmproxy/cmdline.py | 1 | ||||
| -rw-r--r-- | mitmproxy/options.py | 2 | ||||
| -rw-r--r-- | netlib/exceptions.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py index 09866f5b..b5b939b8 100644 --- a/mitmproxy/cmdline.py +++ b/mitmproxy/cmdline.py @@ -481,6 +481,7 @@ def proxy_options(parser): help="Use the client's IP for server-side connections" ) + def proxy_ssl_options(parser): # TODO: Agree to consistently either use "upstream" or "server". group = parser.add_argument_group("SSL") diff --git a/mitmproxy/options.py b/mitmproxy/options.py index 9ef1f108..0ac44cd8 100644 --- a/mitmproxy/options.py +++ b/mitmproxy/options.py @@ -69,7 +69,7 @@ class Options(optmanager.OptManager): mode = "regular", # type: str no_upstream_cert = False, # type: bool rawtcp = False, # type: bool - spoof_source_address = False, # type: bool + spoof_source_address = False, # type: bool upstream_server = "", # type: str upstream_auth = "", # type: str ssl_version_client="secure", # type: str diff --git a/netlib/exceptions.py b/netlib/exceptions.py index 795926f1..37651409 100644 --- a/netlib/exceptions.py +++ b/netlib/exceptions.py @@ -59,5 +59,6 @@ class InvalidCertificateException(TlsException): class Timeout(TcpException): pass + class ProtocolException(NetlibException): pass |