summaryrefslogtreecommitdiff
path: root/roundcubemail/index.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-03-08 08:40:47 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-03-08 08:40:47 +0000
commit9e0c98908e202af91c92bb8694ce80d4a57b7379 (patch)
treea1bf929c2cb196ba031a1c4459c9625719596db0 /roundcubemail/index.php
parentc4f5d43aff9ff52cf9b0062ac02d22aa49f8d9fa (diff)
- Performance improvement: Remove redundant DELETE query (for old session deletion) on login
git-svn-id: https://svn.roundcube.net/trunk@4599 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/index.php')
-rw-r--r--roundcubemail/index.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index 1b1522683..6ebc48e3d 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/index.php
@@ -98,7 +98,9 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
$RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
// 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
$RCMAIL->session->set_auth_cookie();
@@ -110,7 +112,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
$query = array();
if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
parse_str($url, $query);
-
+
// prevent endless looping on login page
if ($query['_task'] == 'login')
unset($query['_task']);