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

fixed problem with clear and session_hash

Browse Source
This commit is contained in:
mdipierro
2012-12-09 14:29:37 -06:00
parent bd933ca43d
commit 24b037c307
2 changed files with 7 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.3.0 (2012-12-08 18:30:53) rc1 Version 2.3.0 (2012-12-09 14:28:45) rc1
gluon/globals.py
+6 -2
View File
@@ -660,6 +660,12 @@ class Session(Storage):
if self.flash: if self.flash:
(response.flash, self.flash) = (self.flash, None) (response.flash, self.flash) = (self.flash, None)
def clear(self):
previous_session_hash = self.pop('_session_hash', None)
Storage.clear(self)
if previous_session_hash:
self._session_hash = previous_session_hash
def is_new(self): def is_new(self):
if self._start_timestamp: if self._start_timestamp:
return False return False
@@ -745,11 +751,9 @@ class Session(Storage):
def _try_store_in_file(self, request, response): def _try_store_in_file(self, request, response):
if response.session_storage_type != 'file': if response.session_storage_type != 'file':
return False return False
try: try:
if not response.session_id or self._forget or self._unchanged(): if not response.session_id or self._forget or self._unchanged():
return False return False
if response.session_new or not response.session_file: if response.session_new or not response.session_file:
# Tests if the session sub-folder exists, if not, create it # Tests if the session sub-folder exists, if not, create it
session_folder = os.path.dirname(response.session_filename) session_folder = os.path.dirname(response.session_filename)