Changeset 1486

Timestamp:

12/09/06 13:21:38

Author:

fumanchu

Message:

2.x backport of [1096] (moved request body size check into _cprequest from _cpwsgi).

Files:

• branches/cherrypy-2.x/cherrypy/_cpengine.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (1 diff)
• branches/cherrypy-2.x/cherrypy/_cpwsgi.py (modified) (1 diff)

branches/cherrypy-2.x/cherrypy/_cpengine.py

@@ -62 +62 @@
-            and conf('session.storage_type') == 'file'):
-            cherrypy._sessionFileLock = threading.RLock()
-        
-        # set cgi.maxlen which will limit the size of POST request bodies
-        cgi.maxlen = conf('server.max_request_size')
-        
-        # Set up the profiler if requested.

branches/cherrypy-2.x/cherrypy/_cphttptools.py

@@ -96 +96 @@
-                    applyFilters('before_request_body')
-                    if self.processRequestBody:
+                        # Prepare the SizeCheckWrapper for the request body
+                        mbs = int(cherrypy.config.get('server.max_request_body_size',
+                                                      100 * 1024 * 1024))
+                        if mbs > 0:
+                            self.rfile = httptools.SizeCheckWrapper(self.rfile, mbs)
+                        
-                        self.processBody()
-                    

branches/cherrypy-2.x/cherrypy/_cpwsgi.py

@@ -159 +159 @@
-                    path = "global"
-                
-                # Prepare the SizeCheckWrapper for the request body
-                mbs = int(cherrypy.config.get('server.max_request_body_size',
-                                              100 * 1024 * 1024, path=path))
-                if isinstance(self.rfile, httptools.SizeCheckWrapper):
-
-
-
-
-
-
-
-
-
+
+
-                self.environ["wsgi.input"] = self.rfile
-