Commit 0a19f8d4 authored by Raphael Merx's avatar Raphael Merx Committed by Tim Graham
Browse files

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'.
parent 6258e163

django/http/response.py

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ class HttpResponseBase(six.Iterator): 
                max_age = max(0, delta.days * 86400 + delta.seconds)

            else:

                self.cookies[key]['expires'] = expires

        else:

            self.cookies[key]['expires'] = ''

        if max_age is not None:

            self.cookies[key]['max-age'] = max_age

            # IE requires expires, so set it if hasn't been already.

tests/requests/tests.py

+12 −0
Original line number Diff line number Diff line
@@ -208,6 +208,18 @@ class RequestsTests(SimpleTestCase): 
        datetime_cookie = response.cookies['datetime']

        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):

        "Cookie will expire when an distant expiration time is provided"

        response = HttpResponse()