[PATCH 2 of 2 STABLE SSL] httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)

[Augie Fackler]

# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1379529928 14400
#      Wed Sep 18 14:45:28 2013 -0400
# Branch stable
# Node ID 6d315e354a066b50ae6db37ece68de1e37977487
# Parent  df135218860d1a54b81d5822019b25ee84cf4fb9
httpclient: apply upstream revision da7579b034a4 to fix SSL problems (issue4038)

diff --git a/mercurial/httpclient/socketutil.py b/mercurial/httpclient/socketutil.py
--- a/mercurial/httpclient/socketutil.py
+++ b/mercurial/httpclient/socketutil.py
@@ -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."""