commit fc69af15629389801db4da64ac06b0a0e747e60a
author Antoine Pitrou <solipsis@pitrou.net> Sat Apr 24 20:04:58 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Sat Apr 24 20:04:58 2010 +0000
tree d2144b94112f150a0df14985241d73227ea955e2
parent 4d3e372ff3f611aa76458a48f26ec4701315c128

Issue #5103: SSL handshake would ignore the socket timeout and block
indefinitely if the other end didn't respond.

Lib/ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 9e88073..1d29bef 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -115,12 +115,7 @@
                                         cert_reqs, ssl_version, ca_certs,
                                         ciphers)
             if do_handshake_on_connect:
-                timeout = self.gettimeout()
-                try:
-                    self.settimeout(None)
-                    self.do_handshake()
-                finally:
-                    self.settimeout(timeout)
+                self.do_handshake()
         self.keyfile = keyfile
         self.certfile = certfile
         self.cert_reqs = cert_reqs