Changeset 1223

Timestamp:

08/06/06 17:17:03

Author:

fumanchu

Message:

Split process_request_body into two flags instead (new request.body_read flag to signal that the request body has already been read).

Files:

• trunk/cherrypy/_cprequest.py (modified) (4 diffs)

trunk/cherrypy/_cprequest.py

@@ -76 +76 @@
-    process_request_body = True
-    body = None
+    body_read = False
-    
-    # Dispatch attributes
@@ -200 +201 @@
-                self.hooks.run('on_start_resource')
-                
-
+ and not self.body_read
-                    # Check path-specific methods_with_bodies.
-                    meths = self.config.get("methods_with_bodies", ("POST", "PUT"))
@@ -214 +215 @@
-                if self.process_request_body:
-                    self.process_body()
-                    # Guard against re-reading body on InternalRedirect
-                    self.process_request_body = False
-                
-                self.hooks.run('before_main')
@@ -362 +361 @@
-    def process_body(self):
-        """Convert request.rfile into request.params (or request.body)."""
+        # Guard against re-reading body (e.g. on InternalRedirect)
+        if self.body_read:
+            return
+        self.body_read = True
+        
-        # FieldStorage only recognizes POST, so fake it.
-        methenv = {'REQUEST_METHOD': "POST"}