diff options
| author | InvalidInterrupt <InvalidInterrupt@users.noreply.github.com> | 2017-04-11 17:35:17 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-04-17 09:58:19 -0400 |
| commit | dda596ca3296f5b2574cf4876a4e176594f52834 (patch) | |
| tree | b3005039242e44936ed7c5b18d6e7ac0f6312d50 /django/contrib | |
| parent | c09bf8d76770d39a4d9545b67598cd05adee281b (diff) | |
Fixed #28066 -- Prevented SessionBase.cycle_key() from discarding data.
Diffstat (limited to 'django/contrib')
| -rw-r--r-- | django/contrib/sessions/backends/base.py | 5 | ||||
| -rw-r--r-- | django/contrib/sessions/backends/signed_cookies.py | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/django/contrib/sessions/backends/base.py b/django/contrib/sessions/backends/base.py index 10d564b752..a395b589b1 100644 --- a/django/contrib/sessions/backends/base.py +++ b/django/contrib/sessions/backends/base.py @@ -295,10 +295,7 @@ class SessionBase: """ Create a new session key, while retaining the current session data. """ - try: - data = self._session_cache - except AttributeError: - data = {} + data = self._session key = self.session_key self.create() self._session_cache = data diff --git a/django/contrib/sessions/backends/signed_cookies.py b/django/contrib/sessions/backends/signed_cookies.py index 6391b3ef3e..1ee7790b8e 100644 --- a/django/contrib/sessions/backends/signed_cookies.py +++ b/django/contrib/sessions/backends/signed_cookies.py @@ -71,9 +71,8 @@ class SessionStore(SessionBase): Instead of generating a random string, generate a secure url-safe base64-encoded string of data as our session key. """ - session_cache = getattr(self, '_session_cache', {}) return signing.dumps( - session_cache, compress=True, + self._session, compress=True, salt='django.contrib.sessions.backends.signed_cookies', serializer=self.serializer, ) |