[PATCH stable] httpclient: import ca33b88d143c from py-nonblocking-http (issue2932)
Augie Fackler
durin42 at gmail.com
Fri Jul 29 12:52:26 CDT 2011
# HG changeset patch
# User Augie Fackler <durin42 at gmail.com>
# Date 1311961605 18000
# Node ID a1573ede4b903a14eec6c8acc4d2cc5d1bea5ca2
# Parent a5046880eca370a421f43e9ea5574793c382f86e
httpclient: import ca33b88d143c from py-nonblocking-http (issue2932)
diff --git a/mercurial/httpclient/socketutil.py b/mercurial/httpclient/socketutil.py
--- a/mercurial/httpclient/socketutil.py
+++ b/mercurial/httpclient/socketutil.py
@@ -78,10 +78,6 @@
CERT_NONE = ssl.CERT_NONE
CERT_OPTIONAL = ssl.CERT_OPTIONAL
CERT_REQUIRED = ssl.CERT_REQUIRED
- PROTOCOL_SSLv2 = ssl.PROTOCOL_SSLv2
- PROTOCOL_SSLv3 = ssl.PROTOCOL_SSLv3
- PROTOCOL_SSLv23 = ssl.PROTOCOL_SSLv23
- PROTOCOL_TLSv1 = ssl.PROTOCOL_TLSv1
else:
class FakeSocket(httplib.FakeSocket):
"""Socket wrapper that supports SSL.
@@ -105,10 +101,7 @@
else:
raise x
- PROTOCOL_SSLv2 = 0
- PROTOCOL_SSLv3 = 1
- PROTOCOL_SSLv23 = 2
- PROTOCOL_TLSv1 = 3
+ _PROTOCOL_SSLv23 = 2
CERT_NONE = 0
CERT_OPTIONAL = 1
@@ -116,7 +109,7 @@
def wrap_socket(sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=CERT_NONE,
- ssl_version=PROTOCOL_SSLv23, ca_certs=None,
+ ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
do_handshake_on_connect=True,
suppress_ragged_eofs=True):
if cert_reqs != CERT_NONE and ca_certs:
diff --git a/mercurial/httpclient/tests/util.py b/mercurial/httpclient/tests/util.py
--- a/mercurial/httpclient/tests/util.py
+++ b/mercurial/httpclient/tests/util.py
@@ -133,7 +133,7 @@
def mocksslwrap(sock, keyfile=None, certfile=None,
server_side=False, cert_reqs=http.socketutil.CERT_NONE,
- ssl_version=http.socketutil.PROTOCOL_SSLv23, ca_certs=None,
+ ssl_version=None, ca_certs=None,
do_handshake_on_connect=True,
suppress_ragged_eofs=True):
return MockSSLSocket(sock)
More information about the Mercurial-devel
mailing list