Changeset 991

Timestamp:

03/02/06 11:58:40

Author:

fumanchu

Message:

Fix for broken test in [990].

Files:

• trunk/cherrypy/_cpwsgi.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)

trunk/cherrypy/_cpwsgi.py

@@ -148 +148 @@
-            if self.ready:
-                # Request header is parsed
-                # We prepare the SizeCheckWrapper for the request body
-                script_name = self.environ.get('SCRIPT_NAME', '')
-                path_info = self.environ.get('PATH_INFO', '')
@@ -154 +153 @@
-                if path == "*":
-                    path = "global"
+                
+                # Prepare the SizeCheckWrapper for the request body
-                mbs = int(cherrypy.config.get('server.max_request_body_size',
-                                              100 * 1024 * 1024, path=path))
-mbs > 0
-isinstance(self.rfile, httptools.SizeCheckWrapper)
+isinstance(self.rfile, httptools.SizeCheckWrapper)
+mbs > 0
-                        self.rfile.bytes_read = 0
-                        self.rfile.maxlen = mbs
-                    else:
+                        # Unwrap the rfile
+                        self.rfile = self.rfile.rfile
+                else:
+                    if mbs > 0:
-                        self.rfile = httptools.SizeCheckWrapper(self.rfile, mbs)
+                self.environ["wsgi.input"] = self.rfile
-
-

trunk/cherrypy/test/test_core.py

@@ -869 +869 @@
-        if s:
-            cherrypy.config.update({
-
+
+
-            self.getPage('/maxrequestsize/upload', h, "POST", b)
-            self.assertStatus("413 Request Entity Too Large")