Changeset 1668

Timestamp:

06/16/07 18:35:25

Author:

fumanchu

Message:

Fix for #689 (add equivalent of trailing_slash tool for static content). The staticdir tool now sets request.is_index if needed. The trailing_slash tool priority was increased to allow most before_handler tools a chance to set is_index.

Files:

• trunk/cherrypy/_cptools.py (modified) (1 diff)
• trunk/cherrypy/lib/static.py (modified) (1 diff)
• trunk/cherrypy/test/test_static.py (modified) (1 diff)

trunk/cherrypy/_cptools.py

@@ -430 +430 @@
-_d.basic_auth = Tool('on_start_resource', auth.basic_auth)
-_d.digest_auth = Tool('on_start_resource', auth.digest_auth)
-
+, priority=60
-_d.flatten = Tool('before_finalize', cptools.flatten)
-_d.accept = Tool('on_start_resource', cptools.accept)

trunk/cherrypy/lib/static.py

@@ -180 +180 @@
-    if not handled:
-        # Check for an index file if a folder was requested.
- and filename[-1] in (r"\/")
+
-            handled = _attempt(os.path.join(filename, index), content_types)
+            if handled:
+                cherrypy.request.is_index = filename[-1] in (r"\/")
-    return handled
-

trunk/cherrypy/test/test_static.py

@@ -110 +110 @@
-        # The same page should be returned even if redirected.
-        self.getPage("/docroot")
-
-
-
+
-        
-        # Check that we get an error if no .file or .dir