comparison mercurial/httpclient/__init__.py @ 16774:69af967b6d6f

httpclient: update to c5abd358e543 of httpplus
author Augie Fackler <raf@durin42.com>
date Fri, 18 May 2012 17:05:17 -0500
parents 24dbef11f477
children e7cfe3587ea4 dc6364a81e42
comparison
equal deleted inserted replaced
16773:d490edc71146 16774:69af967b6d6f
370 logger.info('CONNECT (for SSL) to %s:%s via proxy succeeded.', 370 logger.info('CONNECT (for SSL) to %s:%s via proxy succeeded.',
371 self.host, self.port) 371 self.host, self.port)
372 else: 372 else:
373 sock = socketutil.create_connection((self.host, self.port)) 373 sock = socketutil.create_connection((self.host, self.port))
374 if self.ssl: 374 if self.ssl:
375 # This is the default, but in the case of proxied SSL
376 # requests the proxy logic above will have cleared
377 # blocking mode, so reenable it just to be safe.
378 sock.setblocking(1)
375 logger.debug('wrapping socket for ssl with options %r', 379 logger.debug('wrapping socket for ssl with options %r',
376 self.ssl_opts) 380 self.ssl_opts)
377 sock = socketutil.wrap_socket(sock, **self.ssl_opts) 381 sock = socketutil.wrap_socket(sock, **self.ssl_opts)
378 if self._ssl_validator: 382 if self._ssl_validator:
379 self._ssl_validator(sock) 383 self._ssl_validator(sock)