Changeset 1013

Timestamp:

03/22/06 02:03:50

Author:

fumanchu

Message:

Fix for #496 (memory leak in threadlocal objects).

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgi.py (modified) (3 diffs)

trunk/cherrypy/_cphttptools.py

@@ -39 +39 @@
-            self.closed = True
-            applyFilters('on_end_request', failsafe=True)
+            cherrypy.serving.__dict__.clear()
+            cherrypy.thread_data.__dict__.clear()
-    
-    def run(self, requestLine, headers, rfile):

trunk/cherrypy/_cpwsgi.py

@@ -98 +98 @@
-        if request:
-            request.close()
+        request = None
-    except (KeyboardInterrupt, SystemExit), ex:
-        try:
@@ -104 +105 @@
-        except:
-            cherrypy.log(traceback=True)
+        request = None
-        raise ex
-    except:
@@ -112 +114 @@
-        except:
-            cherrypy.log(traceback=True)
+        request = None
-        s, h, b = _cputil.bareError()
-        # CherryPy test suite expects bareError body to be output,