Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #15765 -- Stopped showing an odd error message when using the s…

…taticfiles enabled runserver management command and trying to serve files from STATIC_URL at the same time.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a3733967e89d38e42c2094d887aa985ffe5e9916 1 parent 87eb3a2
@jezdez jezdez authored
View
3  django/contrib/staticfiles/handlers.py
@@ -35,8 +35,7 @@ def _should_handle(self, path):
* the host is provided as part of the base_url
* the request's path isn't under the media path (or equal)
"""
- return (self.base_url[2] != path and
- path.startswith(self.base_url[2]) and not self.base_url[1])
+ return path.startswith(self.base_url[2]) and not self.base_url[1]
def file_path(self, url):
"""
View
2  django/contrib/staticfiles/views.py
@@ -34,6 +34,8 @@ def serve(request, path, document_root=None, insecure=False, **kwargs):
normalized_path = posixpath.normpath(urllib.unquote(path)).lstrip('/')
absolute_path = finders.find(normalized_path)
if not absolute_path:
+ if path.endswith('/') or path == '':
+ raise Http404("Directory indexes are not allowed here.")
raise Http404("'%s' could not be found" % path)
document_root, path = os.path.split(absolute_path)
return static.serve(request, path, document_root=document_root, **kwargs)
Please sign in to comment.
Something went wrong with that request. Please try again.