summaryrefslogtreecommitdiff
path: root/django/middleware
diff options
context:
space:
mode:
Diffstat (limited to 'django/middleware')
-rw-r--r--django/middleware/http.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/middleware/http.py b/django/middleware/http.py
index a739597f91..4fcde85698 100644
--- a/django/middleware/http.py
+++ b/django/middleware/http.py
@@ -23,8 +23,7 @@ class ConditionalGetMiddleware(MiddlewareMixin):
etag = response.get('ETag')
last_modified = response.get('Last-Modified')
- if last_modified:
- last_modified = parse_http_date_safe(last_modified)
+ last_modified = last_modified and parse_http_date_safe(last_modified)
if etag or last_modified:
return get_conditional_response(