From bd452f90b2032d8d05def99caf6674919827375b Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 20 Sep 2013 08:36:52 -0500 Subject: [PATCH] session._fixup_before_save --- VERSION | 2 +- gluon/globals.py | 8 ++++++++ gluon/main.py | 8 ++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 761c1f37..b4eaa75f 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/globals.py b/gluon/globals.py index 2897ff56..359475bf 100644 --- a/gluon/globals.py +++ b/gluon/globals.py @@ -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 diff --git a/gluon/main.py b/gluon/main.py index d8f664ee..2a17528c 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -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