Changeset c294eaa in github

Timestamp:

Mar 8, 2011 3:40:47 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

4cfe66f

Parents:

fb061aa

Message:

• Performance improvement: Remove redundant DELETE query (for old session deletion) on login

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (2 diffs)
• program/include/rcube_session.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Remove redundant DELETE query (for old session deletion) on login
 - Get around unreliable rand() and mt_rand() in session ID generation (#1486281)
 - Fix some emails are not shown using Cyrus IMAP (#1487820)

index.php

@@ -99 +99 @@
     // create new session ID
     $RCMAIL->session->remove('temp');
-    $RCMAIL->session->regenerate_id();
+    // regenerate the session, don't destroy the current session
+    // it was destroyed already by $RCMAIL->kill_session() above
+    $RCMAIL->session->regenerate_id(false);
 
     // send auth cookie if necessary
@@ -111 +113 @@
     if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
       parse_str($url, $query);
-      
+
       // prevent endless looping on login page
       if ($query['_task'] == 'login')

program/include/rcube_session.php

@@ -206 +206 @@
   /**
    * Generate and set new session id
-   */
-  public function regenerate_id()
-  {
-    // delete old session record
-    $this->destroy(session_id());
+   *
+   * @param boolean $destroy If enabled the current session will be destroyed
+   */
+  public function regenerate_id($destroy=true)
+  {
+    session_regenerate_id($destroy);
+
     $this->vars = false;
-
-    session_regenerate_id(false);
-    $this->key = session_id();
+    $this->key  = session_id();
 
     return true;