mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-29 14:46:18 +01:00
Code Issues Releases Wiki Activity

Fixed #25900 -- Fixed regression in CommonMiddleware ETag support.

Browse Source
This commit is contained in:
Derek J. Curtis 2015-12-09 18:07:02 +07:00 committed by Tim Graham
parent 5bc881541c
commit 6be9589eb3
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/middleware/common.py
View File

@ -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,
)

3
docs/releases/1.9.1.txt
View File

@ -19,3 +19,6 @@ Bugfixes
* Fixed a state bug when migrating a ``SeparateDatabaseAndState`` operation
backwards (:ticket:`25896`).
* Fixed a regression in ``CommonMiddleware`` causing ``If-None-Match`` checks
to always return HTTP 200 (:ticket:`25900`).

10
tests/middleware/tests.py
View File

@ -291,6 +291,16 @@ class CommonMiddlewareTest(SimpleTestCase):
res = StreamingHttpResponse(['content'])
self.assertFalse(CommonMiddleware().process_response(req, res).has_header('ETag'))
@override_settings(USE_ETAGS=True)
def test_if_none_match(self):
first_req = HttpRequest()
first_res = CommonMiddleware().process_response(first_req, HttpResponse('content'))
second_req = HttpRequest()
second_req.method = 'GET'
second_req.META['HTTP_IF_NONE_MATCH'] = first_res['ETag']
second_res = CommonMiddleware().process_response(second_req, HttpResponse('content'))
self.assertEqual(second_res.status_code, 304)
# Other tests
@override_settings(DISALLOWED_USER_AGENTS=[re.compile(r'foo')])