Ticket #5816: 5816.diff

django/contrib/sessions/middleware.py

@@ -1 +1 @@
 from django.conf import settings
 from django.utils.cache import patch_vary_headers
 from email.Utils import formatdate
-import datetime
 import time
 
 TEST_COOKIE_NAME = 'testcookie'
@@ -34 +33 @@
 
                     # Fixed length date must have '-' separation in the format
                     # DD-MMM-YYYY for compliance with Netscape cookie standard
-                    expires = datetime.datetime.strftime(datetime.datetime.utcnow() + \
-                              datetime.timedelta(seconds=settings.SESSION_COOKIE_AGE), "%a, %d-%b-%Y %H:%M:%S GMT")
-
+                    # Note: strftime cannot be used here since it is locale-dependent
+                    expires = (rfcdate[:7] + "-" + rfcdate[8:11]
+                               + "-" + rfcdate[12:26] + "GMT")
                 # Save the seesion data and refresh the client cookie.
                 request.session.save()
                 response.set_cookie(settings.SESSION_COOKIE_NAME,