From 83a28021ad863d0ced37594df68c5b97381910f1 Mon Sep 17 00:00:00 2001 From: smill Date: Wed, 14 Sep 2016 19:11:57 +0000 Subject: [PATCH] Fixed travis-ci issues. --- mitmproxy/cmdline.py | 1 + mitmproxy/options.py | 2 +- netlib/exceptions.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py index 09866f5b6..b5b939b8c 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 9ef1f108d..0ac44cd8e 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 795926f11..376514096 100644 --- a/netlib/exceptions.py +++ b/netlib/exceptions.py @@ -59,5 +59,6 @@ class InvalidCertificateException(TlsException): class Timeout(TcpException): pass + class ProtocolException(NetlibException): pass