| commit | 40f0874b5556b278526ee9443b83efa2a6f723ca | [log] [tgz] |
|---|---|---|
| author | Antoine Pitrou <solipsis@pitrou.net> | Sat Apr 24 22:04:40 2010 +0000 |
| committer | Antoine Pitrou <solipsis@pitrou.net> | Sat Apr 24 22:04:40 2010 +0000 |
| tree | 24f90858038b2aac9c83f9145de32d5b4730f80d | |
| parent | d3f8ab8bd37d942d64773e9043697003b8502049 [diff] [blame] |
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).
diff --git a/Lib/ssl.py b/Lib/ssl.py index a42643f..f06792e 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py
@@ -102,6 +102,7 @@ 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)