Ticket #6984: session-key-patch.diff

django/contrib/sessions/middleware.py

@@ -33 +33 @@
                     max_age = settings.SESSION_COOKIE_AGE
                     expires_time = time.time() + settings.SESSION_COOKIE_AGE
                     expires = cookie_date(expires_time)
-                # Save the seesion data and refresh the client cookie.
+                # Save the session data and refresh the client cookie.
                 request.session.save()
                 response.set_cookie(settings.SESSION_COOKIE_NAME,
                         request.session.session_key, max_age=max_age,

django/contrib/sessions/backends/file.py

@@ -57 +57 @@
         return session_data
 
     def save(self):
+        # make sure the session dict is loaded into memory before saving it back
+        self._get_session()
         try:
             f = open(self._key_to_file(self.session_key), "wb")
             try:

django/contrib/sessions/backends/cache.py

@@ -15 +15 @@
         return session_data or {}
 
     def save(self):
+        # make sure the session dict is loaded into memory before saving it back
+        self._get_session()
         self._cache.set(self.session_key, self._session, settings.SESSION_COOKIE_AGE)
 
     def exists(self, session_key):

django/contrib/sessions/backends/db.py

@@ -38 +38 @@
         return True
 
     def save(self):
+        # make sure the session dict is loaded into memory before saving it back
+        self._get_session()
         Session.objects.create(
             session_key = self.session_key,
             session_data = self.encode(self._session),