Ticket #8314: session-fix.diff

django/contrib/sessions/backends/base.py

@@ -173 +173 @@
         delta = expiry - datetime.now()
         return delta.days * 86400 + delta.seconds
 
-    def get_expiry_date(self):
+    def get_expiry_date(self, creating=False):
         """Get session the expiry date (as a datetime object)."""
-        expiry = self.get('_session_expiry')
-        if isinstance(expiry, datetime):
-            return expiry
+        if creating:
+            expiry = None
+        else:
+            expiry = self.get('_session_expiry')
+            if isinstance(expiry, datetime):
+                return expiry
         if not expiry:   # Checks both None and 0 cases
             expiry = settings.SESSION_COOKIE_AGE
         return datetime.now() + timedelta(seconds=expiry)

django/contrib/sessions/backends/db.py

@@ -47 +47 @@
         create a *new* entry (as opposed to possibly updating an existing
         entry).
         """
+        if must_create:
+            session_data = self.encode({})
+        else:
+            session_data = self.encode(self._session)
         obj = Session(
             session_key = self.session_key,
-            session_data = self.encode(self._session),
-            expire_date = self.get_expiry_date()
+            session_data = session_data,
+            expire_date = self.get_expiry_date(creating=True)
         )
         sid = transaction.savepoint()
         try: