Ticket #15500: add_support_for_cookie_expiry_setting.patch

django/contrib/sessions/backends/base.py

@@ -3 +3 @@
 import random
 import sys
 import time
+from calendar import timegm
 from datetime import datetime, timedelta
 try:
     import cPickle as pickle
@@ -197 +198 @@
 
     _session = property(_get_session)
 
+    def _get_expiry_setting(self):
+        """
+        Returns seconds until the cookie expires. Gets this value from either
+        SESSION_COOKIE_AGE or SESSION_COOKIE_EXPIRY_UTC.
+        """
+        # If SESSION_COOKIE_EXPIRY_UTC is set by the user, use it.
+        # otherwise return the default: SESSION_COOKIE_AGE.
+        if not hasattr(settings, 'SESSION_COOKIE_EXPIRY_UTC'):
+            return settings.SESSION_COOKIE_AGE
+        else:
+            # Return the difference between the expiration date in UTC and
+            # the current unix time rounded down to seconds
+            return timegm(time.strptime(settings.SESSION_COOKIE_EXPIRY_UTC,
+                "%Y-%m-%d %H:%M:%S")) - int(time.time())
+    
     def get_expiry_age(self):
         """Get the number of seconds until the session expires."""
         expiry = self.get('_session_expiry')
         if not expiry:   # Checks both None and 0 cases
-            return settings.SESSION_COOKIE_AGE
+            return self._get_expiry_setting()
         if not isinstance(expiry, datetime):
             return expiry
         delta = expiry - datetime.now()
@@ -213 +229 @@
         if isinstance(expiry, datetime):
             return expiry
         if not expiry:   # Checks both None and 0 cases
-            expiry = settings.SESSION_COOKIE_AGE
+            expiry = self._get_expiry_setting()
         return datetime.now() + timedelta(seconds=expiry)
 
+    
     def set_expiry(self, value):
         """
         Sets a custom expiration for the session. ``value`` can be an integer,

django/contrib/sessions/backends/cached_db.py

@@ -39 +39 @@
         """
         self.clear()
         self.delete(self.session_key)
-        self.create()
- No newline at end of file
+        self.create()