session._fixup_before_save

This commit is contained in:
mdipierro
2013-09-20 08:36:52 -05:00
parent 2b1f150f02
commit bd452f90b2
3 changed files with 11 additions and 7 deletions

View File

@@ -1 +1 @@
Version 2.6.3-stable+timestamp.2013.09.19.22.17.43
Version 2.6.3-stable+timestamp.2013.09.20.08.35.53

View File

@@ -932,6 +932,14 @@ class Session(Storage):
else:
response.session_new = True
def _fixup_before_save(self):
response = current.response
rcookies = response.cookies
if self._forget and response.session_id_name in rcookies:
del rcookies[response.session_id_name]
elif self._secure and response.session_id_name in rcookies:
rcookies[response.session_id_name]['secure'] = True
def clear_session_cookies(sefl):
request = current.request
response = current.response

View File

@@ -503,12 +503,8 @@ def wsgibase(environ, responder):
# store cookies in headers
# ##################################################
rcookies = response.cookies
if session._forget and response.session_id_name in rcookies:
del rcookies[response.session_id_name]
elif session._secure:
rcookies[response.session_id_name]['secure'] = True
http_response.cookies2headers(rcookies)
session._fixup_before_save()
http_response.cookies2headers(response.cookies)
ticket = None