diff options
| author | Derek J. Curtis <djcurtis@summersetsoftware.com> | 2015-12-09 18:07:02 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-12-10 14:00:49 -0500 |
| commit | 364d7d969039bd14d3072a5ed035b88b44d855fd (patch) | |
| tree | 4092bee26090edec956b22130016d81e79693ff8 /django | |
| parent | 521db45875fd50031e8bbff5867ff73919a9e6e9 (diff) | |
[1.9.x] Fixed #25900 -- Fixed regression in CommonMiddleware ETag support.
Backport of 6be9589eb34f79914666c9d9e1e15bdb7fc44df2 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/middleware/common.py | 4 |
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, ) |