Changeset 1839

Timestamp:

01/12/08 18:00:22

Author:

fumanchu

Message:

Fixed some problems with redirect after staticdir.

Files:

• trunk/cherrypy/_cperror.py (modified) (3 diffs)
• trunk/cherrypy/test/test_static.py (modified) (1 diff)

trunk/cherrypy/_cperror.py

@@ -113 +113 @@
-                   }[status]
-            response.body = "<br />\n".join([msg % (u, u) for u in self.urls])
+            # Previous code may have set C-L, so we have to reset it
+            # (allow finalize to set it).
+            response.headers.pop('Content-Length', None)
-        elif status == 304:
-            # Not Modified.
@@ -129 +132 @@
-            # "The 304 response MUST NOT contain a message-body."
-            response.body = None
+            # Previous code may have set C-L, so we have to reset it.
+            response.headers.pop('Content-Length', None)
-        elif status == 305:
-            # Use Proxy.
@@ -134 +139 @@
-            response.headers['Location'] = self.urls[0]
-            response.body = None
+            # Previous code may have set C-L, so we have to reset it.
+            response.headers.pop('Content-Length', None)
-        else:
-            raise ValueError("The %s status code is unknown." % status)

trunk/cherrypy/test/test_static.py

@@ -111 +111 @@
-        self.getPage("/docroot")
-        self.assertStatus((302, 303))
+        self.assertHeader('Location', '%s/docroot/' % self.base())
+        self.assertBody("This resource can be found at <a href='%s/docroot/'>"
+                        "%s/docroot/</a>." % (self.base(), self.base()))
-        
-        # Check that we get an error if no .file or .dir