Changeset 1177
- Timestamp:
- 06/29/06 18:50:12
- Files:
-
- trunk/cherrypy/_cptools.py (modified) (1 diff)
- trunk/cherrypy/lib/sessions.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cptools.py
r1172 r1177 182 182 183 183 s = cherrypy.request._session = _sessions.Session() 184 # Copy all conf entries onto Session object attributes 184 185 for k, v in conf.iteritems(): 185 186 setattr(s, str(k), v) trunk/cherrypy/lib/sessions.py
r1174 r1177 130 130 # So we have to use the old "expires" ... sigh ... 131 131 #cookie[cookie_name]['max-age'] = self.timeout * 60 132 gmt_expiration_time = time.gmtime(time.time() + (self.timeout * 60)) 133 cookie[self.cookie_name]['expires'] = http.HTTPDate(gmt_expiration_time) 132 if self.timeout: 133 gmt_expiration_time = time.gmtime(time.time() + (self.timeout * 60)) 134 cookie[self.cookie_name]['expires'] = http.HTTPDate(gmt_expiration_time) 134 135 if self.cookie_domain is not None: 135 136 cookie[self.cookie_name]['domain'] = self.cookie_domain
