Changeset 616

Timestamp:

09/08/05 11:16:52

Author:

mikerobi

Message:

fixed ticket:285, made cgi.maxlen global, as recommended in ticket:90

Files:

• trunk/CHANGELOG.txt (modified) (1 diff)
• trunk/cherrypy/_cpcgifs.py (modified) (2 diffs)
• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/server.py (modified) (1 diff)

trunk/CHANGELOG.txt

@@ +1 @@
+2005-09-04:
+    * Generalized mechanism for handling HTTP errors
+    * raising a HTTPStatusError will automatically send an appropriate error page
+    * All errors in production mode will cause CP to respond with a http error
+
-2005-08-17:
-    * The session filter has been simplified, the mechanism for creating multiple sessions has been removed. However .. (mikerobi)

trunk/cherrypy/_cpcgifs.py

@@ -1 +1 @@
-import cgi
-import cherrypy
-
-try:
-    from threading import local
-except ImportError:
-    from cherrypy._cpthreadinglocal import local
-
-class LocalInt:
@@ -24 +19 @@
-        return str(self.__local.value)
-
-cgi.maxlen = LocalInt(0)
-
-class FieldStorage(cgi.FieldStorage):
-    def __init__(self, *args, **kwds):
-        maxlen = cherrypy.config.get('server.maxRequestSize')
-        cgi.maxlen.setValue(maxlen)
-        try:
-            cgi.FieldStorage.__init__(self, *args, **kwds)
-
-
+
+
+
+
+
-
-    def read_lines_to_eof(self):

trunk/cherrypy/_cphttptools.py

@@ -461 +461 @@
-            if not extrabody:
-                extrabody = ''
-
+cherrypy.lib.
-            headers = [('Content-Length', str(len(_body))), ('Content-Type', 'text/html')]
-            return (status, headers, _body)

trunk/cherrypy/server.py

@@ -93 +93 @@
-        and cherrypy.config.get('session.storageType') == 'file'):
-        cherrypy._sessionFileLock = threading.RLock()
+    
+    # set cgi.maxlen which will limit the size of POST request bodies
+    import cgi
+    cgi.maxlen = cherrypy.config.get('server.maxRequestSize')
-    
-    # Call the functions from cherrypy.server.onStartServerList