Changeset 2272

Timestamp:

05/12/09 15:36:31

Author:

fumanchu

Message:

python3: Fix for #853 (consistent time out of the WSGI server).

Files:

• branches/python3/cherrypy/test/test_conn.py (modified) (3 diffs)
• branches/python3/cherrypy/wsgiserver/__init__.py (modified) (9 diffs)

branches/python3/cherrypy/test/test_conn.py

@@ -247 +247 @@
-    
-    def test_HTTP11_Timeout(self):
+        # If we timeout without sending any data,
+        # the server will close the conn with a 408.
+        if cherrypy.server.protocol_version != "HTTP/1.1":
+            print("skipped ", end=' ')
+            return
+        
+        self.PROTOCOL = "HTTP/1.1"
+        
+        # Connect but send nothing.
+        self.persistent = True
+        conn = self.HTTP_CONN
+        conn.auto_open = False
+        conn.connect()
+        
+        # Wait for our socket timeout
+        time.sleep(timeout * 2)
+        
+        # The request should have returned 408 already.
+        response = conn.response_class(conn.sock, method="GET")
+        response.begin()
+        self.assertEqual(response.status, 408)
+        conn.close()
+        
+        # Connect but send half the headers only.
+        self.persistent = True
+        conn = self.HTTP_CONN
+        conn.auto_open = False
+        conn.connect()
+        conn.send(b'GET /hello HTTP/1.1')
+        conn.send(("Host: %s" % self.HOST).encode('ascii'))
+        
+        # Wait for our socket timeout
+        time.sleep(timeout * 2)
+        
+        # The conn should have already sent 408.
+        response = conn.response_class(conn.sock, method="GET")
+        response.begin()
+        self.assertEqual(response.status, 408)
+        conn.close()
+    
+    def test_HTTP11_Timeout_after_request(self):
+        # If we timeout after at least one request has succeeded,
+        # the server will close the conn without 408.
-        if cherrypy.server.protocol_version != "HTTP/1.1":
-            print("skipped ", end=' ')
@@ -291 +334 @@
-                          " as it should have: %s" % sys.exc_info()[1])
-        else:
-
-
-
-
+
+
+
-        
-        conn.close()
@@ -316 +358 @@
-        time.sleep(timeout * 2)
-        response = conn.response_class(conn.sock, method="GET")
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        conn.close()
-        

branches/python3/cherrypy/wsgiserver/__init__.py

@@ -90 +90 @@
-import threading
-import time
-
+
-from urllib.parse import unquote
-from urllib.parse import urlparse
@@ -288 +288 @@
-        
-        self.ready = False
+        self.started_request = False
-        self.started_response = False
-        self.status = ""
@@ -315 +316 @@
-        # with FIN_WAIT_2).
-        request_line = self.rfile.readline()
+        # Set started_request to True so communicate() knows to send 408
+        # from here on out.
+        self.started_request = True
-        if not request_line:
-            # Force self.ready = False so the connection will close.
@@ -341 +345 @@
-            self.simple_response(400, "Malformed Request-Line")
-            return
-        print(repr(request_line))
-        
-        environ["REQUEST_URI"] = path
@@ -420 +423 @@
-        
-        mrbs = self.max_request_body_size
-        print('mrbs', mrbs)
-        print('cl', environ.get("CONTENT_LENGTH", 0))
-        if mrbs and int(environ.get("CONTENT_LENGTH", 0)) > mrbs:
-            self.simple_response("413 Request Entity Too Large")
@@ -536 +537 @@
-        if ct is not None:
-            environ["CONTENT_TYPE"] = ct
-            print('server ct', ct)
-        cl = environ.pop("HTTP_CONTENT_LENGTH", None)
-        if cl is not None:
@@ -923 +923 @@
-    def communicate(self):
-        """Read each request and respond appropriately."""
+        request_seen = False
-        try:
-            while True:
@@ -935 +936 @@
-                req.parse_request()
-                if not req.ready:
+                    # Something went wrong in the parsing (and the server has
+                    # probably already made a simple_response). Return and
+                    # let the conn close.
-                    return
-                
+                request_seen = True
-                req.respond()
-                if req.close_connection:
-                    return
-        
-        except socket.error as e:
-            errnum = e.args[0]
-            if errnum == 'timed out':
-
-
+
+
+
+
+
+
+
+
+
-            elif errnum not in socket_errors_to_ignore:
-                if req and not req.sent_headers:
@@ -991 +1002 @@
-            # Apache does, but not today.
-            pass
-
-
-def format_exc(limit=None):
-    """Like print_exc() but return a string. Backport for Python 2.3."""
-    try:
-        etype, value, tb = sys.exc_info()
-        return ''.join(traceback.format_exception(etype, value, tb, limit))
-    finally:
-        etype = value = tb = None
-
-