That was a bit too much. I forgot i experimented with session regeneration.

Remove it.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10363 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/global.php b/functions/global.php
index 59b3fc9692ba1e20709f922b1dc1b46f3155a709..a477f9952d476f064a6fdd1d8a1c07a417ffbfc7 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -226,9 +226,6 @@ function sqsession_destroy() {
     if (!empty( $sessid )) {
         $_SESSION = array();
         @session_destroy();
-        session_regenerate_id(true);
-        sqsetcookie(session_name(), '', 0, $base_uri);
-        session_write_close();
     }
 
 }
@@ -306,46 +303,6 @@ function sqsetcookie($sName,$sValue,$iExpire=false,$sPath="",$sDomain="",$bSecur
     header($sHeader);
 }
 
-function php_combined_lcg() {
-    $tv = gettimeofday();
-    $lcg['s1'] = $tv['sec'] ^ (~$tv['usec']);
-    $lcg['s2'] = posix_getpid();
-
-    $q = (int) ($lcg['s1'] / 53668);
-    $lcg['s1'] = (int) (40014 * ($lcg['s1'] - 53668 * $q) - 12211 * $q);
-    if ($lcg['s1'] < 0)
-        $lcg['s1'] += 2147483563;
-
-    $q = (int) ($lcg['s2'] / 52774);
-    $lcg['s2'] = (int) (40692 * ($lcg['s2'] - 52774 * $q) - 3791 * $q);
-    if ($lcg['s2'] < 0)
-        $lcg['s2'] += 2147483399;
-
-    $z = (int) ($lcg['s1'] - $lcg['s2']);
-    if ($z < 1) {
-        $z += 2147483562;
-    }
-
-    return $z * 4.656613e-10;
-}
-
-
-if (!function_exists('session_regenerate_id')) {
-
-    function session_regenerate_id() {
-        global $base_uri;
-
-        $tv = gettimeofday();
-        $buf = sprintf("%.15s%ld%ld%0.8f", $_SERVER['REMOTE_ADDR'], $tv['sec'], $tv['usec'], php_combined_lcg() * 10);
-        $sessid = session_id(md5($buf));
-        if (ini_get('session.use_cookies')) {
-            if (isset($_COOKIE[session_name()])) sqsetcookie(session_name(), $sessid, 0, $base_uri);
-        }
-        return true;
-    }
-}
-
-
 /**
  * php_self
  *