Changeset 1407

Timestamp:

10/22/06 16:54:12

Author:

fumanchu

Message:

Fixed hang on InternalRedirect? with sessions tool.

Files:

• trunk/cherrypy/lib/sessions.py (modified) (3 diffs)
• trunk/cherrypy/test/test_session.py (modified) (2 diffs)

trunk/cherrypy/lib/sessions.py

@@ -212 +212 @@
-
-class FileSession(Session):
-
+
+
+
+
+
+
-    
-    SESSION_PREFIX = 'session-'
@@ -240 +245 @@
-    
-    def _delete(self):
-
+
+
+
+
-    
-    def acquire_lock(self, path=None):
@@ -389 +397 @@
-    request = cherrypy.request
-    
+    # Guard against running twice
+    if hasattr(cherrypy._serving, "session"):
+        return
+    
-    # Check if request came with a session ID
-    id = None

trunk/cherrypy/test/test_session.py

@@ -51 +51 @@
-            return "done"
-        delete.exposed = True
+        
+        def blah(self):
+            return self._cp_config['tools.sessions.storage_type']
+        blah.exposed = True
+        
+        def iredir(self):
+            raise cherrypy.InternalRedirect('/blah')
+        iredir.exposed = True
-    
-    cherrypy.tree.mount(Root())
-    cherrypy.config.update({'environment': 'test_suite'})
+
-
-from cherrypy.test import helper
@@ -134 +143 @@
-        expected = 1 + (client_thread_count * request_count)
-        self.assertEqual(hitcount, expected)
+    
+    def test_3_Redirect(self):
+        # Start a new session
+        self.getPage('/testStr')
+        self.getPage('/iredir', self.cookies)
+        self.assertBody("file")
+    
+    def test_4_File_deletion(self):
+        # Start a new session
+        self.getPage('/testStr')
+        # Delete the session file manually and retry.
+        id = self.cookies[0][1].split(";", 1)[0].split("=", 1)[1]
+        path = os.path.join(localDir, "session-" + id)
+        os.unlink(path)
+        self.getPage('/testStr', self.cookies)
-
-