From 0a19f8d4fc864de481eac1b76c799ffd6ced4e91 Mon Sep 17 00:00:00 2001 From: Raphael Merx Date: Fri, 30 Oct 2015 15:05:11 -0700 Subject: 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'. --- django/http/response.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'django') diff --git a/django/http/response.py b/django/http/response.py index ed5c14eef8..94d14ddb54 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -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. -- cgit v1.3