Ticket #12399: patch1.diff

django/contrib/sessions/backends/cached_db.py

@@ -6 +6 @@
 from django.contrib.sessions.backends.db import SessionStore as DBStore
 from django.core.cache import cache
 
+import time
+
 class SessionStore(DBStore):
     """
     Implements cached, database backed sessions.
@@ -18 +20 @@
         data = cache.get(self.session_key, None)
         if data is None:
             data = super(SessionStore, self).load()
-            cache.set(self.session_key, data, settings.SESSION_COOKIE_AGE)
+            expires = settings.SESSION_COOKIE_AGE
+            # Memcached needs a unix timestamp for expiry values greater than 2592000.
+            if settings.CACHE_BACKEND.lower().startswith('memcached') and expires > 2592000:
+                cache.set(self.session_key, data, int(time.time()) + settings.SESSION_COOKIE_AGE)
+            else:
+                cache.set(self.session_key, data, settings.SESSION_COOKIE_AGE)
         return data
 
     def exists(self, session_key):
@@ -26 +33 @@
 
     def save(self, must_create=False):
         super(SessionStore, self).save(must_create)
-        cache.set(self.session_key, self._session, settings.SESSION_COOKIE_AGE)
+        expires = settings.SESSION_COOKIE_AGE
+        # Memcached needs a unix timestamp for expiry values greater than 2592000.
+        if settings.CACHE_BACKEND.lower().startswith('memcached') and expires > 2592000:
+            cache.set(self.session_key, self._session, int(time.time()) + settings.SESSION_COOKIE_AGE)
+        else:        
+            cache.set(self.session_key, self._session, settings.SESSION_COOKIE_AGE)
 
     def delete(self, session_key=None):
         super(SessionStore, self).delete(session_key)