Merge pull request #1047 from web2py/revert-1046-master

Revert "added default HttpOnly cookies"
2015-08-18 13:59:07 -05:00
parent 6899154fcd 89cc5a5f70
commit 622430583f
1 changed files with 3 additions and 9 deletions
@@ -1023,16 +1023,10 @@ class Session(Storage):
    def _fixup_before_save(self):
        response = current.response
        rcookies = response.cookies
-        scookies = rcookies.get(response.session_id_name)
-        if not scookies:
-            return
-        if self._forget:
+        if self._forget and response.session_id_name in rcookies:
            del rcookies[response.session_id_name]
-            return
-        if self.get('httponly_cookies',True):
-            scookies['HttpOnly'] = True
-        if self._secure:
-            scookies['secure'] = True
+        elif self._secure and response.session_id_name in rcookies:
+            rcookies[response.session_id_name]['secure'] = True

    def clear_session_cookies(self):
        request = current.request