Ticket #13548: set_cookie.diff

django/http/__init__.py

@@ -1 +1 @@
 import os
 import re
+import time
 from Cookie import BaseCookie, SimpleCookie, CookieError
 from pprint import pformat
 from urllib import urlencode
@@ -12 +13 @@
 
 from django.utils.datastructures import MultiValueDict, ImmutableList
 from django.utils.encoding import smart_str, iri_to_uri, force_unicode
+from django.utils.http import cookie_date
 from django.http.multipartparser import MultiPartParser
 from django.conf import settings
 from django.core.files import uploadhandler
@@ -373 +375 @@
 
     def set_cookie(self, key, value='', max_age=None, expires=None, path='/',
                    domain=None, secure=False):
+        # IE doesn't support the max-age property
+        if max_age is not None and expires is None:
+            expires = cookie_date(time.time() + max_age)
         self.cookies[key] = value
         if max_age is not None:
             self.cookies[key]['max-age'] = max_age