Changeset 1971

Timestamp:

05/25/08 17:02:41

Author:

fumanchu

Message:

Test and fix for #810 (Add 408 responses).

Files:

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

trunk/cherrypy/test/test_conn.py

@@ -224 +224 @@
-            self.persistent = True
-            conn = self.HTTP_CONN
-            # Make the socket nonblocking so it can timeout
-##            conn.connect()
-##            conn.sock.settimeout(0.1)
-            conn.putrequest("GET", "/", skip_host=True)
-            conn.putheader("Host", self.HOST)
@@ -269 +266 @@
-            
-            # Make another request on a new socket, which should work
+            self.persistent = True
+            conn = self.HTTP_CONN
+            conn.putrequest("GET", "/", skip_host=True)
+            conn.putheader("Host", self.HOST)
+            conn.endheaders()
+            response = conn.response_class(conn.sock, method="GET")
+            response.begin()
+            self.assertEqual(response.status, 200)
+            self.body = response.read()
+            self.assertBody(pov)
+            
+            # Make another request on the same socket,
+            # but timeout on the headers
+            conn.send('GET /hello HTTP/1.1')
+            # Wait for our socket timeout
+            time.sleep(timeout * 2)
+            response = conn.response_class(conn.sock, method="GET")
+            response.begin()
+            self.assertEqual(response.status, 408)
+            conn.close()
+            
+            # Retry the request on a new connection, which should work
-            self.persistent = True
-            conn = self.HTTP_CONN

trunk/cherrypy/wsgiserver/__init__.py

@@ -979 +979 @@
-        except socket.error, e:
-            errnum = e.args[0]
-
+
+
+
+
-                if req:
-                    req.simple_response("500 Internal Server Error",