From dfb36a693f0758e5d30dcfc33ab9cb97d5d5228b Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Mon, 2 Nov 2009 21:10:27 +0000 Subject: [PATCH] Improve handling of session.auto_start git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1224 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/bootstrap.inc.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php index c407354b..2b738dde 100644 --- a/adminer/include/bootstrap.inc.php +++ b/adminer/include/bootstrap.inc.php @@ -43,16 +43,15 @@ if (!isset($_SERVER["REQUEST_URI"])) { $_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . (strlen($_SERVER["QUERY_STRING"]) ? "?$_SERVER[QUERY_STRING]" : ""); } -if (!ini_get("session.auto_start")) { - @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled - session_name("adminer_sid"); // use specific session name to get own namespace - $params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $_SERVER["HTTPS"]); - if (version_compare(PHP_VERSION, '5.2.0') >= 0) { - $params[] = true; // HttpOnly - } - call_user_func_array('session_set_cookie_params', $params); - session_start(); +session_write_close(); // disable session.auto_start +@ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled +session_name("adminer_sid"); // use specific session name to get own namespace +$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $_SERVER["HTTPS"]); +if (version_compare(PHP_VERSION, '5.2.0') >= 0) { + $params[] = true; // HttpOnly } +call_user_func_array('session_set_cookie_params', $params); // ini_set() may be disabled +session_start(); // disable magic quotes to be able to use database escaping function if (get_magic_quotes_gpc()) {