Changeset 1616

Timestamp:

02/08/07 12:25:52

Author:

fumanchu

Message:

Fix for #650 (PUT request with empty body/params ignored).

Files:

• trunk/cherrypy/_cprequest.py (modified) (2 diffs)
• trunk/cherrypy/wsgiserver/__init__.py (modified) (2 diffs)

trunk/cherrypy/_cprequest.py

@@ -630 +630 @@
-    def process_body(self):
-        """Convert request.rfile into request.params (or request.body). (Core)"""
+        if not self.headers.get("Content-Length", ""):
+            # No Content-Length header supplied (or it's 0).
+            # If we went ahead and called cgi.FieldStorage, it would hang,
+            # since it cannot determine when to stop reading from the socket.
+            # See http://www.cherrypy.org/ticket/493.
+            # See also http://www.cherrypy.org/ticket/650.
+            # Note also that we expect any HTTP server to have decoded
+            # any message-body that had a transfer-coding, and we expect
+            # the HTTP server to have supplied a Content-Length header
+            # which is valid for the decoded entity-body.
+            return
+        
-        # FieldStorage only recognizes POST, so fake it.
-        methenv = {'REQUEST_METHOD': "POST"}
@@ -816 +828 @@
-            self.timed_out = True
-
+

trunk/cherrypy/wsgiserver/__init__.py

@@ -267 +267 @@
-        if read_chunked:
-            if not self.decode_chunked():
-                return
-        else:
-            cl = environ.get("CONTENT_LENGTH")
-            if method in ("POST", "PUT") and cl is None:
-                # No Content-Length header supplied. This will hang
-                # cgi.FieldStorage, since it cannot determine when to
-                # stop reading from the socket.
-                # See http://www.cherrypy.org/ticket/493.
-                self.simple_response("411 Length Required")
-                return
-        
@@ -1006 +997 @@
-                    self.ssl_environ[wsgikey] = value
-
+