[PATCH stable?] httpclient: import revision aab9ed3181f0 of py-nonblocking-http

[Augie Fackler]

Blah. There's a defect in this. Will re-send in a few minutes. Disregard.

On Jul 28, 2011, at 3:13 PM, Augie Fackler wrote:

> # HG changeset patch
> # User Augie Fackler <durin42 at gmail.com>
> # Date 1311888399 18000
> # Node ID 3980752252f230856340cc7c6f779f187d929da9
> # Parent  b4c06b97dfe0cae28497bc3ab85c075a173de8e6
> httpclient: import revision aab9ed3181f0 of py-nonblocking-http
> 
> 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:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel