Changeset 1988

Timestamp:

06/23/08 23:04:12

Author:

fumanchu

Message:

Fix for #823 (Automatic comparison of content-length and max_request_body_size).

Files:

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

trunk/cherrypy/test/test_conn.py

@@ -547 +547 @@
-        conn.close()
-    
+    def test_Content_Length(self):
+        # Try a non-chunked request where Content-Length exceeds
+        # server.max_request_body_size. Assert error before body send.
+        self.persistent = True
+        conn = self.HTTP_CONN
+        conn.putrequest("POST", "/upload", skip_host=True)
+        conn.putheader("Host", self.HOST)
+        conn.putheader("Content-Type", "text/plain")
+        conn.putheader("Content-Length", 9999)
+        conn.endheaders()
+        response = conn.getresponse()
+        self.status, self.headers, self.body = webtest.shb(response)
+        self.assertStatus(413)
+        self.assertBody("")
+        conn.close()
+    
-    def test_HTTP10(self):
-        self.PROTOCOL = "HTTP/1.0"

trunk/cherrypy/wsgiserver/__init__.py

@@ -396 +396 @@
-        except ValueError, ex:
-            self.simple_response("400 Bad Request", repr(ex.args))
+            return
+        
+        mrbs = self.max_request_body_size
+        if mrbs and int(environ.get("CONTENT_LENGTH", 0)) > mrbs:
+            self.simple_response("413 Request Entity Too Large")
-            return
-