httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)

This commit is contained in:
Augie Fackler 2013-09-18 14:45:28 -04:00
parent ecc34bd7c0
commit 401f0a3a21

View File

@ -106,7 +106,7 @@ else:
else:
raise x
_PROTOCOL_SSLv3 = 1
_PROTOCOL_SSLv23 = 2
CERT_NONE = 0
CERT_OPTIONAL = 1
@ -118,7 +118,7 @@ else:
# pylint: disable=W0613,R0913
def wrap_socket(sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=CERT_NONE,
ssl_version=_PROTOCOL_SSLv3, ca_certs=None,
ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
do_handshake_on_connect=True,
suppress_ragged_eofs=True):
"""Backport of ssl.wrap_socket from Python 2.6."""