Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Changed django.utils.cache.patch_response_headesr to move unnecessary…

… calculation of 'expires' into the 'if' statement

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent a05e05a commit 426e7223fb7bf1639a3b331ed3818922fafe820c @adrianholovaty adrianholovaty committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/utils/
2  django/utils/
@@ -73,12 +73,12 @@ def patch_response_headers(response, cache_timeout=None):
if cache_timeout is None:
cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS
now = datetime.datetime.utcnow()
- expires = now + datetime.timedelta(0, cache_timeout)
if not response.has_header('ETag'):
response['ETag'] ='utf8')).hexdigest()
if not response.has_header('Last-Modified'):
response['Last-Modified'] = now.strftime('%a, %d %b %Y %H:%M:%S GMT')
if not response.has_header('Expires'):
+ expires = now + datetime.timedelta(0, cache_timeout)
response['Expires'] = expires.strftime('%a, %d %b %Y %H:%M:%S GMT')
patch_cache_control(response, max_age=cache_timeout)

0 comments on commit 426e722

Please sign in to comment.
Something went wrong with that request. Please try again.