Ticket #1013: index-dot-html.diff

django/views/static.py

@@ -7 +7 @@
 from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect
 from django.core.template import Template, Context, TemplateDoesNotExist
 
-def serve(request, path, document_root=None, show_indexes=False):
+def serve(request, path, document_root=None, show_indexes=False, default=''):
     """
     Serve static files below a given point in the directory structure.
 
@@ -19 +19 @@
     also set ``show_indexes`` to ``True`` if you'd like to serve a basic index
     of the directory.  This index view will use the template hardcoded below,
     but if you'd like to override it, you can create a template called
-    ``static/directory_index``.
+    ``static/directory_index``.  To use a file as the directory index, set
+    ``default`` to the filename to use (eg. ``index.html``).
     """
 
     # Clean up given path to only allow serving files below document_root.
@@ -37 +38 @@
         newpath = os.path.join(newpath, part).replace('\\', '/')
     if newpath and path != newpath:
         return HttpResponseRedirect(newpath)
-    fullpath = os.path.join(document_root, newpath)
+    fullpath = os.path.join(document_root, newpath)
+    if os.path.isdir(fullpath) and default:
+        defaultpath = os.path.join(fullpath, default)
+        if os.path.exists(defaultpath):
+            fullpath = defaultpath
     if os.path.isdir(fullpath):
         if show_indexes:
             return directory_index(newpath, fullpath)