Changeset 1550

Timestamp:

12/21/06 15:01:28

Author:

fumanchu

Message:

Better solution to #625: have the SSL file objects inheirt the timeout of their socket, which is copied from httpserver.timeout.

Files:

• trunk/cherrypy/test/test_conn.py (modified) (1 diff)
• trunk/cherrypy/wsgiserver.py (modified) (1 diff)

trunk/cherrypy/test/test_conn.py

@@ -185 +185 @@
-            self.assertBody("Hello, world!")
-            
-            if self.scheme == "https":
-                # Adjust the timeout up to cover the higher timeouts of SSL
-                # (the wsgiserver ssl_timeout default is 3 seconds)
-                tout = 4
-            else:
-                tout = timeout * 2
-            
-            # Wait for our socket timeout
-out
+imeout * 2
-            
-            # Make another request on the same socket, which should error

trunk/cherrypy/wsgiserver.py

@@ -546 +546 @@
-        
-        if SSL and isinstance(sock, SSL.ConnectionType):
+            timeout = sock.gettimeout()
-            self.rfile = SSL_fileobject(sock, "r", self.rbufsize)
+            self.rfile.ssl_timeout = timeout
-            self.wfile = SSL_fileobject(sock, "w", self.wbufsize)
+            self.wfile.ssl_timeout = timeout
-            self.environ["wsgi.url_scheme"] = "https"
-            self.environ["HTTPS"] = "on"