summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorDerek J. Curtis <djcurtis@summersetsoftware.com>2015-12-09 18:07:02 +0700
committerTim Graham <timograham@gmail.com>2015-12-10 13:51:07 -0500
commit6be9589eb34f79914666c9d9e1e15bdb7fc44df2 (patch)
tree8c9a8a173e92ab1c47737df2bb73c094025774d9 /django
parent5bc881541caafbac6911fb26d9718b8ad6d45b2a (diff)
Fixed #25900 -- Fixed regression in CommonMiddleware ETag support.
Diffstat (limited to 'django')
-rw-r--r--django/middleware/common.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py
index 5aeb746f81..3db925c894 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -120,7 +120,9 @@ class CommonMiddleware(object):
if response.has_header('ETag'):
return get_conditional_response(
request,
- etag=response['ETag'],
+ # get_conditional_response() requires an unquoted version
+ # of the response's ETag.
+ etag=response['ETag'].strip('"'),
response=response,
)