Changeset 2993

Timestamp:

07/07/2008 08:27:40 PM (5 months ago)

Author:

Shadowhand

Message:

Updated Session::delete() to delete the session cookie when calling destroy() and added write_close() as a shutdown function to prevent odd buffer problems with some session handlers (namely Database).

Files:

• trunk/system/libraries/Session.php (modified) (4 diffs)

trunk/system/libraries/Session.php

@@ -78 +78 @@
                         Event::add('system.send_headers', array($this, 'write_close'));
 
+                        // Make sure that sessions are closed before exiting
+                        register_shutdown_function(array($this, 'write_close'));
+
                         // Singleton instance
                         self::$instance = $this;
@@ -103 +106 @@
         public function create($vars = NULL)
         {
-                // Destroy any currently running session
+                // Destroy any current sessions
                 $this->destroy();
 
@@ -246 +249 @@
                 if (isset($_COOKIE[$name]))
                 {
-                        // Change the cookie value to match the new session id to remove the "lag time"
+                        // Change the cookie value to match the new session id to prevent "lag"
                         $_COOKIE[$name] = $_SESSION['session_id'];
                 }
@@ -258 +261 @@
         public function destroy()
         {
-                if (isset($_SESSION))
-                {
+                if (session_id() !== '')
+                {
+                        // Get the session name
+                        $name = session_name();
+
                         // Destroy the session
                         session_destroy();
 
-                        // Remove all session data
-                        session_unset();
-
-                        // Delete the session cookie
-                        cookie::delete(self::$config['name']);
-
                         // Re-initialize the array
                         $_SESSION = array();
+
+                        // Delete the session cookie
+                        cookie::delete($name);
                 }
         }