From 9d83444f16c7e289881dca132c5f4f3f8e58d05c Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Thu, 14 Aug 2008 03:58:09 +0000 Subject: [PATCH] Fixed #6984 -- Make sure to load session data from the file (if necessary) prior to truncating it during a save. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8344 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/sessions/backends/file.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py index 8290cad80a..7fb608df90 100644 --- a/django/contrib/sessions/backends/file.py +++ b/django/contrib/sessions/backends/file.py @@ -71,10 +71,13 @@ class SessionStore(SessionBase): flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC | getattr(os, 'O_BINARY', 0) if must_create: flags |= os.O_EXCL + # Because this may trigger a load from storage, we must do it before + # truncating the file to save. + session_data = self._session try: fd = os.open(self._key_to_file(self.session_key), flags) try: - os.write(fd, self.encode(self._session)) + os.write(fd, self.encode(session_data)) finally: os.close(fd) except OSError, e: