##// END OF EJS Templates
httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)
Augie Fackler -
r19748:59df9e52 stable
parent child Browse files
Show More
@@ -106,7 +106,7 b' else:'
106 else:
106 else:
107 raise x
107 raise x
108
108
109 _PROTOCOL_SSLv3 = 1
109 _PROTOCOL_SSLv23 = 2
110
110
111 CERT_NONE = 0
111 CERT_NONE = 0
112 CERT_OPTIONAL = 1
112 CERT_OPTIONAL = 1
@@ -118,7 +118,7 b' else:'
118 # pylint: disable=W0613,R0913
118 # pylint: disable=W0613,R0913
119 def wrap_socket(sock, keyfile=None, certfile=None,
119 def wrap_socket(sock, keyfile=None, certfile=None,
120 server_side=False, cert_reqs=CERT_NONE,
120 server_side=False, cert_reqs=CERT_NONE,
121 ssl_version=_PROTOCOL_SSLv3, ca_certs=None,
121 ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
122 do_handshake_on_connect=True,
122 do_handshake_on_connect=True,
123 suppress_ragged_eofs=True):
123 suppress_ragged_eofs=True):
124 """Backport of ssl.wrap_socket from Python 2.6."""
124 """Backport of ssl.wrap_socket from Python 2.6."""
General Comments 0
You need to be logged in to leave comments. Login now