Added timeout support to HTTPSConnection, through the

socket.create_connection function. Also added a small
test for this, and updated NEWS file.
This commit is contained in:
Facundo Batista 2007-05-21 17:32:32 +00:00
parent 767debb6aa
commit 70f996be24
3 changed files with 13 additions and 6 deletions

View file

@ -1124,16 +1124,15 @@ class HTTPSConnection(HTTPConnection):
default_port = HTTPS_PORT
def __init__(self, host, port=None, key_file=None, cert_file=None,
strict=None):
HTTPConnection.__init__(self, host, port, strict)
strict=None, timeout=None):
HTTPConnection.__init__(self, host, port, strict, timeout)
self.key_file = key_file
self.cert_file = cert_file
def connect(self):
"Connect to a host on a given (SSL) port."
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect((self.host, self.port))
sock = socket.create_connection((self.host, self.port), self.timeout)
ssl = socket.ssl(sock, self.key_file, self.cert_file)
self.sock = FakeSocket(sock, ssl)