p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #15765 -- Stopped showing an odd error message when using the staticfiles 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
This commit is contained in:
Jannis Leidel 2011-07-04 16:19:54 +00:00
parent 87eb3a25aa
commit a3733967e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/staticfiles/handlers.py
View File

@ -35,8 +35,7 @@ class StaticFilesHandler(WSGIHandler):
* the host is provided as part of the base_url * the host is provided as part of the base_url
* the request's path isn't under the media path (or equal) * the request's path isn't under the media path (or equal)
""" """
return (self.base_url[2] != path and return path.startswith(self.base_url[2]) and not self.base_url[1]
path.startswith(self.base_url[2]) and not self.base_url[1])
def file_path(self, url): def file_path(self, url):
""" """

2
django/contrib/staticfiles/views.py
View File

@ -34,6 +34,8 @@ def serve(request, path, document_root=None, insecure=False, **kwargs):
normalized_path = posixpath.normpath(urllib.unquote(path)).lstrip('/') normalized_path = posixpath.normpath(urllib.unquote(path)).lstrip('/')
absolute_path = finders.find(normalized_path) absolute_path = finders.find(normalized_path)
if not absolute_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) raise Http404("'%s' could not be found" % path)
document_root, path = os.path.split(absolute_path) document_root, path = os.path.split(absolute_path)
return static.serve(request, path, document_root=document_root, **kwargs) return static.serve(request, path, document_root=document_root, **kwargs)