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

improved session data in cookie

Browse Source
This commit is contained in:
mdipierro
2012-10-16 07:44:22 -05:00
parent b6a496aae5
commit d404e40508
2 changed files with 5 additions and 3 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 07:10:29) dev Version 2.1.1 (2012-10-16 07:44:17) dev
gluon/globals.py
+4 -2
View File
@@ -523,7 +523,7 @@ class Session(Storage):
else: else:
response.session_id = None response.session_id = None
# do not try load the data from file is these was data in cookie # do not try load the data from file is these was data in cookie
if response.session_id and not session_cookie_data: if response.session_id: #TODO and not session_cookie_data:
try: try:
response.session_file = \ response.session_file = \
open(response.session_filename, 'rb+') open(response.session_filename, 'rb+')
@@ -591,7 +591,7 @@ class Session(Storage):
if record_id == '0': if record_id == '0':
raise Exception, 'record_id == 0' raise Exception, 'record_id == 0'
# Select from database # Select from database
if not request.session_cookie_data: if True: # TODO: not session_cookie_data:
rows = db(table.id == record_id).select() rows = db(table.id == record_id).select()
# Make sure the session data exists in the database # Make sure the session data exists in the database
if len(rows) == 0 or rows[0].unique_key != unique_key: if len(rows) == 0 or rows[0].unique_key != unique_key:
@@ -612,6 +612,8 @@ class Session(Storage):
rcookies[response.session_id_name] = response.session_id rcookies[response.session_id_name] = response.session_id
rcookies[response.session_id_name]['path'] = '/' rcookies[response.session_id_name]['path'] = '/'
# TODO: if not session data in cookie, delete seession_data_name cookie # TODO: if not session data in cookie, delete seession_data_name cookie
#if session_cookie_data:
# rcookies[response.session_data_name]
if self.flash: if self.flash:
(response.flash, self.flash) = (self.flash, None) (response.flash, self.flash) = (self.flash, None)