From 4d9548b1f55d2ab2a13d3b9c66759a800a79e53e Mon Sep 17 00:00:00 2001
From: niphlod <niphlod@gmail.com>
Date: Fri, 13 Feb 2015 22:54:27 +0100
Subject: [PATCH] fixes #735. Review CAREFULLY before merging

---
 gluon/globals.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gluon/globals.py b/gluon/globals.py
index 8d95289e..e73630e1 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -1053,6 +1053,20 @@ class Session(Storage):
                 rcookies[response.session_id_name]['expires'] = expires
 
     def clear(self):
+        # see https://github.com/web2py/web2py/issues/735
+        response = current.response
+        if response.session_storage_type == 'file':
+            target = recfile.generate(response.session_filename)
+            try:
+                os.unlink(target)
+            except:
+                pass
+        elif response.session_storage_type == 'db':
+            table = response.session_db_table
+            if response.session_id:
+                (record_id, sep, unique_key) = response.session_id.partition(':')
+                if record_id.isdigit() and long(record_id) > 0:
+                    table._db(table.id == record_id).delete()
         Storage.clear(self)
 
     def is_new(self):