httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038) stable
authorAugie Fackler <raf@durin42.com>
Wed, 18 Sep 2013 14:45:28 -0400
branchstable
changeset 19748 59df9e52b5bb
parent 19708 fd4f612f7cb6
child 19749 f2871c30e6a7
httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)
mercurial/httpclient/socketutil.py
--- a/mercurial/httpclient/socketutil.py	Sat Sep 07 21:20:00 2013 +0200
+++ b/mercurial/httpclient/socketutil.py	Wed Sep 18 14:45:28 2013 -0400
@@ -106,7 +106,7 @@
                     else:
                         raise x
 
-    _PROTOCOL_SSLv3 = 1
+    _PROTOCOL_SSLv23 = 2
 
     CERT_NONE = 0
     CERT_OPTIONAL = 1
@@ -118,7 +118,7 @@
     # 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."""