innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #25644 -- Fixed reset cookie expiry date bug. 

Setting a cookie with the same name as a previously deleted cookie
would set its expiry date to 'Thu, 01-Jan-1970 00:00:00 GMT'.
This commit is contained in:
Raphael Merx 2015-10-30 15:05:11 -07:00 committed by Tim Graham
parent 6258e16335
commit 0a19f8d4fc
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/http/response.py
View File

@ -190,6 +190,8 @@ class HttpResponseBase(six.Iterator):
max_age = max(0, delta.days * 86400 + delta.seconds) max_age = max(0, delta.days * 86400 + delta.seconds)
else: else:
self.cookies[key]['expires'] = expires self.cookies[key]['expires'] = expires
else:
self.cookies[key]['expires'] = ''
if max_age is not None: if max_age is not None:
self.cookies[key]['max-age'] = max_age self.cookies[key]['max-age'] = max_age
# IE requires expires, so set it if hasn't been already. # IE requires expires, so set it if hasn't been already.

12
tests/requests/tests.py
View File

@ -208,6 +208,18 @@ class RequestsTests(SimpleTestCase):
datetime_cookie = response.cookies['datetime'] datetime_cookie = response.cookies['datetime']
self.assertEqual(datetime_cookie['max-age'], 10) self.assertEqual(datetime_cookie['max-age'], 10)
def test_create_cookie_after_deleting_cookie(self):
"""
Setting a cookie after deletion should clear the expiry date.
"""
response = HttpResponse()
response.set_cookie('c', 'old-value')
self.assertEqual(response.cookies['c']['expires'], '')
response.delete_cookie('c')
self.assertEqual(response.cookies['c']['expires'], 'Thu, 01-Jan-1970 00:00:00 GMT')
response.set_cookie('c', 'new-value')
self.assertEqual(response.cookies['c']['expires'], '')
def test_far_expiration(self): def test_far_expiration(self):
"Cookie will expire when an distant expiration time is provided" "Cookie will expire when an distant expiration time is provided"
response = HttpResponse() response = HttpResponse()