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.

1 files changed, 3 insertions, 1 deletions

diff --git a/cherrypy/lib/static.py b/cherrypy/lib/static.py
index dee635e7..8ef70ea9 100644
--- a/cherrypy/lib/static.py
+++ b/cherrypy/lib/static.py
@@ -179,8 +179,10 @@ def staticdir(section, dir, root="", match="", content_types=None, index=""):
     handled = _attempt(filename, content_types)
     if not handled:
         # Check for an index file if a folder was requested.
-        if index and filename[-1] in (r"\/"):
+        if index:
             handled = _attempt(os.path.join(filename, index), content_types)
+            if handled:
+                cherrypy.request.is_index = filename[-1] in (r"\/")
     return handled
 
 def staticfile(filename, root=None, match="", content_types=None):