Fixed #4994 -- Send back set-cookie headers in "not modified" responses. Well spotted, colin@owlfish.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
56e28b4e8f
commit
0e7299e10a
|
@ -80,7 +80,9 @@ class CommonMiddleware(object):
|
||||||
else:
|
else:
|
||||||
etag = md5.new(response.content).hexdigest()
|
etag = md5.new(response.content).hexdigest()
|
||||||
if response.status_code >= 200 and response.status_code < 300 and request.META.get('HTTP_IF_NONE_MATCH') == etag:
|
if response.status_code >= 200 and response.status_code < 300 and request.META.get('HTTP_IF_NONE_MATCH') == etag:
|
||||||
|
cookies = response.cookies
|
||||||
response = http.HttpResponseNotModified()
|
response = http.HttpResponseNotModified()
|
||||||
|
response.cookies = cookies
|
||||||
else:
|
else:
|
||||||
response['ETag'] = etag
|
response['ETag'] = etag
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue