From 27924acf437df92c4e6e88e79bd28a58e6ea4aaa Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 13 May 2009 03:17:33 -0400
Subject: [PATCH] - speed up the whole session cleaning in kill_session()
---
program/include/iniset.php | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index fda13e9..eef1ec5 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,7 +5,7 @@
| program/include/iniset.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008, RoundCube Dev, - Switzerland |
+ | Copyright (C) 2008-2009, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -22,7 +22,7 @@
// application constants
-define('RCMAIL_VERSION', '0.2-trunk');
+define('RCMAIL_VERSION', '0.3-trunk');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
@@ -34,7 +34,7 @@
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
- define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
+ define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');
}
// RC include folders MUST be included FIRST to avoid other
@@ -50,11 +50,15 @@
die('Fatal error: ini_set/set_include_path does not work.');
}
+ini_set('error_reporting', E_ALL&~E_NOTICE);
+if (isset($_SERVER['HTTPS'])) {
+ ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0);
+} else {
+ ini_set('session.cookie_secure', 0);
+}
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
ini_set('session.only_use_cookies', 1);
-ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off')));
-ini_set('error_reporting', E_ALL&~E_NOTICE);
set_magic_quotes_runtime(0);
// increase maximum execution time for php scripts
@@ -72,6 +76,7 @@
* Use PHP5 autoload for dynamic class loading
*
* @todo Make Zend, PEAR etc play with this
+ * @todo Make our classes conform to a more straight forward CS.
*/
function __autoload($classname)
{
@@ -90,7 +95,7 @@
),
$classname
);
- include_once $filename. '.php';
+ include $filename. '.php';
}
/**
@@ -112,4 +117,3 @@
// set PEAR error handling (will also load the PEAR main class)
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
-
--
Gitblit v1.9.1