##// END OF EJS Templates
httpclient: update to revision 9517a2b56fe9 of httpplus (issue3905)...
Augie Fackler -
r19489:42fcb2f7 stable
parent child Browse files
Show More
@@ -622,6 +622,8 class HTTPConnection(object):
622 # TODO: find a way to block on ssl flushing its buffer
622 # TODO: find a way to block on ssl flushing its buffer
623 # similar to selecting on a raw socket.
623 # similar to selecting on a raw socket.
624 continue
624 continue
625 if e[0] == errno.EWOULDBLOCK or e[0] == errno.EAGAIN:
626 continue
625 elif (e[0] not in (errno.ECONNRESET, errno.EPIPE)
627 elif (e[0] not in (errno.ECONNRESET, errno.EPIPE)
626 and not first):
628 and not first):
627 raise
629 raise
@@ -106,7 +106,7 else:
106 else:
106 else:
107 raise x
107 raise x
108
108
109 _PROTOCOL_SSLv23 = 2
109 _PROTOCOL_SSLv3 = 1
110
110
111 CERT_NONE = 0
111 CERT_NONE = 0
112 CERT_OPTIONAL = 1
112 CERT_OPTIONAL = 1
@@ -118,7 +118,7 else:
118 # pylint: disable=W0613,R0913
118 # pylint: disable=W0613,R0913
119 def wrap_socket(sock, keyfile=None, certfile=None,
119 def wrap_socket(sock, keyfile=None, certfile=None,
120 server_side=False, cert_reqs=CERT_NONE,
120 server_side=False, cert_reqs=CERT_NONE,
121 ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
121 ssl_version=_PROTOCOL_SSLv3, ca_certs=None,
122 do_handshake_on_connect=True,
122 do_handshake_on_connect=True,
123 suppress_ragged_eofs=True):
123 suppress_ragged_eofs=True):
124 """Backport of ssl.wrap_socket from Python 2.6."""
124 """Backport of ssl.wrap_socket from Python 2.6."""
General Comments 0
You need to be logged in to leave comments. Login now