Changeset 1174

Timestamp:

06/29/06 12:42:31

Author:

fumanchu

Message:

CP 2.2 and 3.0 fix for #516 (Sessionfilter doesn't format properly the cookie date field "Expires" if the locale is not 'C').

Files:

• branches/cherrypy-2.x/cherrypy/filters/sessionfilter.py (modified) (2 diffs)
• trunk/cherrypy/lib/sessions.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/filters/sessionfilter.py

@@ -39 +39 @@
-import cherrypy
-import basefilter
+from cherrypy.lib import httptools
-
-
@@ -155 +156 @@
-        gmt_expiration_time = time.gmtime(time.time() +
-                (sess.session_timeout * 60))
-
-
+
-        if cookie_domain is not None:
-            cookie[cookie_name]['domain'] = cookie_domain

trunk/cherrypy/lib/sessions.py

@@ -26 +26 @@
-
-import cherrypy
+from cherrypy.lib import http
-
-_session_last_clean_up_time = datetime.datetime.now()
@@ -130 +131 @@
-        #cookie[cookie_name]['max-age'] = self.timeout * 60
-        gmt_expiration_time = time.gmtime(time.time() + (self.timeout * 60))
-
-
+
-        if self.cookie_domain is not None:
-            cookie[self.cookie_name]['domain'] = self.cookie_domain