Changeset 1128

Timestamp:

06/08/06 00:50:48

Author:

fumanchu

Message:

Fix for #507 (InternalRedirect? supports only absolute paths). Paths relative to script_name are now possible by omitting the leading slash from the path.

Files:

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

trunk/cherrypy/_cperror.py

@@ -31 +31 @@
-        import cherrypy
-        request = cherrypy.request
+        
+        # Note that urljoin will "do the right thing" whether url is:
+        #  1. a URL relative to root (e.g. "/dummy")
+        #  2. a URL relative to the current path
+        # Note that any querystring will be discarded.
+        path = urlparse.urljoin(cherrypy.request.path_info, path)
-        
-        # Set a 'path' member attribute so that code which traps this

trunk/cherrypy/test/test_core.py

@@ -144 +144 @@
-        def index(self):
-            raise cherrypy.InternalRedirect("/")
+        
+        def relative(self):
+            raise cherrypy.InternalRedirect("cousin")
+        
+        def cousin(self):
+            return "I am a redirected page."
-        
-        def petshop(self, user_id):
@@ -549 +555 @@
-        self.getPage("/internalredirect/secure")
-        self.assertBody('Please log in')
+        self.assertStatus(200)
+        
+        # Relative path in InternalRedirect
+        self.getPage("/internalredirect/relative")
+        self.assertBody('I am a redirected page.')
-        self.assertStatus(200)
-