Changeset 672

Timestamp:

09/21/05 04:02:44

Author:

rdelon

Message:

Fixed #313 (when favicon.ico was being served, the session wasn't released because the machinery was being bypassed)

Files:

• trunk/cherrypy/_cphttptools.py (modified) (1 diff)
• trunk/cherrypy/lib/filter/sessionfilter.py (modified) (2 diffs)

trunk/cherrypy/_cphttptools.py

@@ -756 +756 @@
-            icofile = os.path.join(os.path.dirname(__file__), "favicon.ico")
-            cptools.serveFile(icofile)
+            applyFilters('beforeFinalize')
-            finalize()
-            raise cherrypy.RequestHandled()

trunk/cherrypy/lib/filter/sessionfilter.py

@@ -205 +205 @@
-    def _clean(self, sess):
-        if getattr(sess, 'locked', None):
-
-
-
+
-            sess.sessionStorage.releaseLock()
-        if getattr(sess, 'sessionStorage', None):
@@ -235 +233 @@
-            if time.time() - startTime > sess.deadlockTimeout:
-                raise SessionDeadlockError()
+            time.sleep(0.5)
-        sess.locked = True
-