diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-08-12 13:10:45 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-08-12 13:10:45 +0000 |
| commit | 0e7299e10ad527824953be217803f61526919d4b (patch) | |
| tree | be356bb49c1754748b98134b15a13078559e5ecb | |
| parent | 56e28b4e8fd923b8e84ceaaf8d0560175ec97c46 (diff) | |
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
| -rw-r--r-- | django/middleware/common.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/middleware/common.py b/django/middleware/common.py index d238bb182d..e18ec079af 100644 --- a/django/middleware/common.py +++ b/django/middleware/common.py @@ -80,7 +80,9 @@ class CommonMiddleware(object): else: 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: + cookies = response.cookies response = http.HttpResponseNotModified() + response.cookies = cookies else: response['ETag'] = etag |