Fixed travis-ci issues.

This commit is contained in:
smill 2016-09-14 19:11:57 +00:00
parent 9429f1bc7b
commit 83a28021ad
3 changed files with 3 additions and 1 deletions

View File

@ -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")

View File

@ -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

View File

@ -59,5 +59,6 @@ class InvalidCertificateException(TlsException):
class Timeout(TcpException):
pass
class ProtocolException(NetlibException):
pass