diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 22:04:40 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-24 22:04:40 (GMT) |
commit | 40f0874b5556b278526ee9443b83efa2a6f723ca (patch) | |
tree | 24f90858038b2aac9c83f9145de32d5b4730f80d /Lib/ssl.py | |
parent | d3f8ab8bd37d942d64773e9043697003b8502049 (diff) | |
download | cpython-40f0874b5556b278526ee9443b83efa2a6f723ca.zip cpython-40f0874b5556b278526ee9443b83efa2a6f723ca.tar.gz cpython-40f0874b5556b278526ee9443b83efa2a6f723ca.tar.bz2 |
Issue #8524: When creating an SSL socket, the timeout value of the
original socket wasn't retained (instead, a socket with a positive timeout
would be turned into a non-blocking SSL socket).
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r-- | Lib/ssl.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -102,6 +102,7 @@ class SSLSocket(socket): type=sock.type, proto=sock.proto, fileno=_dup(sock.fileno())) + self.settimeout(sock.gettimeout()) sock.close() elif fileno is not None: socket.__init__(self, fileno=fileno) |