mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
Changed django.utils.cache.patch_response_headesr to move unnecessary calculation of 'expires' into the 'if' statement
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
a05e05a7f0
commit
426e7223fb
@ -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'] = md5.new(response.get_content_as_string('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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user