Mercurial > hg
changeset 19750:d4ed26beae0e
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 18 Sep 2013 14:52:16 -0500 |
| parents | da3808bcfbfa (current diff) f2871c30e6a7 (diff) |
| children | 11fdf9f754b7 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httpclient/socketutil.py Fri Sep 06 13:30:57 2013 +0400 +++ b/mercurial/httpclient/socketutil.py Wed Sep 18 14:52:16 2013 -0500 @@ -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."""
--- a/mercurial/sslutil.py Fri Sep 06 13:30:57 2013 +0400 +++ b/mercurial/sslutil.py Wed Sep 18 14:52:16 2013 -0500 @@ -17,8 +17,7 @@ def ssl_wrap_socket(sock, keyfile, certfile, cert_reqs=ssl.CERT_NONE, ca_certs=None): sslsocket = ssl.wrap_socket(sock, keyfile, certfile, - cert_reqs=cert_reqs, ca_certs=ca_certs, - ssl_version=ssl.PROTOCOL_SSLv3) + cert_reqs=cert_reqs, ca_certs=ca_certs) # check if wrap_socket failed silently because socket had been closed # - see http://bugs.python.org/issue13721 if not sslsocket.cipher():