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

Fixed #17689 -- Stopped the CachedStaticFilesStorage from trying to hash paths that aren't files. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2012-02-16 14:40:32 +00:00
parent 8f4d12ead2
commit 758a0cd0f1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/staticfiles/storage.py
View File

@ -105,13 +105,16 @@ class CachedFilesMixin(object):
hashed_name, fragment = name, '' hashed_name, fragment = name, ''
else: else:
clean_name, fragment = urldefrag(name) clean_name, fragment = urldefrag(name)
cache_key = self.cache_key(name) if urlsplit(clean_name).path.endswith('/'): # don't hash paths
hashed_name = self.cache.get(cache_key) hashed_name = name
if hashed_name is None: else:
hashed_name = self.hashed_name(clean_name).replace('\\', '/') cache_key = self.cache_key(name)
# set the cache if there was a miss hashed_name = self.cache.get(cache_key)
# (e.g. if cache server goes down) if hashed_name is None:
self.cache.set(cache_key, hashed_name) hashed_name = self.hashed_name(clean_name).replace('\\', '/')
# set the cache if there was a miss
# (e.g. if cache server goes down)
self.cache.set(cache_key, hashed_name)
final_url = super(CachedFilesMixin, self).url(hashed_name) final_url = super(CachedFilesMixin, self).url(hashed_name)

4
tests/regressiontests/staticfiles_tests/tests.py
View File

@ -317,6 +317,10 @@ class TestCollectionCachedStorage(BaseCollectionTestCase,
"/static/test/file.ea5bccaf16d5.txt") "/static/test/file.ea5bccaf16d5.txt")
self.assertStaticRenders("cached/styles.css", self.assertStaticRenders("cached/styles.css",
"/static/cached/styles.93b1147e8552.css") "/static/cached/styles.93b1147e8552.css")
self.assertStaticRenders("path/",
"/static/path/")
self.assertStaticRenders("path/?query",
"/static/path/?query")
def test_template_tag_simple_content(self): def test_template_tag_simple_content(self):
relpath = self.cached_file_path("cached/styles.css") relpath = self.cached_file_path("cached/styles.css")