dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

session cookie data no expires by default

Browse Source
This commit is contained in:
Massimo
2012-10-16 11:14:52 -05:00
parent c13b4f18f7
commit f6789eaf39
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.1.1 (2012-10-16 11:08:39) dev Version 2.1.1 (2012-10-16 11:14:48) dev
gluon/globals.py
+6 -1
View File
@@ -468,6 +468,7 @@ class Session(Storage):
separate = None, separate = None,
check_client=False, check_client=False,
cookie_key=None, cookie_key=None,
cookie_expires=FUTURE,
): ):
""" """
separate can be separate=lambda(session_name): session_name[-2:] separate can be separate=lambda(session_name): session_name[-2:]
@@ -504,6 +505,7 @@ class Session(Storage):
if cookie_key: if cookie_key:
response.session_storage_type = 'cookie' response.session_storage_type = 'cookie'
response.session_cookie_key = cookie_key response.session_cookie_key = cookie_key
response.session_data_expires = cookie_expires
if session_cookie_data: if session_cookie_data:
data = secure_loads(session_cookie_data,cookie_key) data = secure_loads(session_cookie_data,cookie_key)
if data: if data:
@@ -647,9 +649,12 @@ class Session(Storage):
def _try_store_in_cookie(self, request, response): def _try_store_in_cookie(self, request, response):
if response.session_storage_type!='cookie': return False if response.session_storage_type!='cookie': return False
value = secure_dumps(dict(self),response.session_cookie_key) value = secure_dumps(dict(self),response.session_cookie_key)
response.cookies.pop(response.session_data_name,None)
response.cookies[response.session_data_name] = value response.cookies[response.session_data_name] = value
response.cookies[response.session_data_name]['path'] = '/' response.cookies[response.session_data_name]['path'] = '/'
response.cookies[response.session_data_name]['expires'] = FUTURE expires = response.session_data_expires
if expires:
response.cookies[response.session_data_name]['expires'] = expires
return True return True
def _unchanged(self): def _unchanged(self):