# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 2012-05-18 22:05:17
# Node ID 69af967b6d6f81b62a024ad9a98f4174bc1f18de
# Parent  d490edc711461a5b26dc845fa797643aad6536d0

httpclient: update to c5abd358e543 of httpplus

diff --git a/mercurial/httpclient/__init__.py b/mercurial/httpclient/__init__.py
--- a/mercurial/httpclient/__init__.py
+++ b/mercurial/httpclient/__init__.py
@@ -372,6 +372,10 @@ class HTTPConnection(object):
         else:
             sock = socketutil.create_connection((self.host, self.port))
         if self.ssl:
+            # This is the default, but in the case of proxied SSL
+            # requests the proxy logic above will have cleared
+            # blocking mode, so reenable it just to be safe.
+            sock.setblocking(1)
             logger.debug('wrapping socket for ssl with options %r',
                          self.ssl_opts)
             sock = socketutil.wrap_socket(sock, **self.ssl_opts)
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
@@ -58,6 +58,7 @@ class MockSocket(object):
         self.close_on_empty = False
         self.sent = ''
         self.read_wait_sentinel = httpplus._END_HEADERS
+        self.blocking = True
 
     def close(self):
         self.closed = True
@@ -66,9 +67,11 @@ class MockSocket(object):
         self.sa = sa
 
     def setblocking(self, timeout):
-        assert timeout == 0
+        self.blocking = bool(timeout)
 
     def recv(self, amt=-1):
+        # we only properly emulate non-blocking sockets
+        assert not self.blocking
         if self.early_data:
             datalist = self.early_data
         elif not self.data:
@@ -136,6 +139,8 @@ def mocksslwrap(sock, keyfile=None, cert
                 ssl_version=None, ca_certs=None,
                 do_handshake_on_connect=True,
                 suppress_ragged_eofs=True):
+    assert sock.blocking, ('wrapping a socket with ssl requires that '
+                           'it be in blocking mode.')
     return MockSSLSocket(sock)