Merge pull request #308 from niphlod/issue/1780

fixes issue 1780
2013-11-27 10:00:49 -08:00
parent 165b682e01 92ab6dc635
commit f9e16557c4
1 changed files with 5 additions and 4 deletions
@@ -976,10 +976,11 @@ class Session(Storage):

        # if not cookie_key, but session_data_name in cookies
        # expire session_data_name from cookies
-        if response.session_data_name in cookies:
-            rcookies[response.session_data_name] = 'expired'
-            rcookies[response.session_data_name]['path'] = '/'
-            rcookies[response.session_data_name]['expires'] = PAST
+        if not response.session_cookie_key:
+            if response.session_data_name in cookies:
+                rcookies[response.session_data_name] = 'expired'
+                rcookies[response.session_data_name]['path'] = '/'
+                rcookies[response.session_data_name]['expires'] = PAST
        if response.session_id:
            rcookies[response.session_id_name] = response.session_id
            rcookies[response.session_id_name]['path'] = '/'