Improve handling of session.auto_start

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1224 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index c407354bc8f340fa874ed6ee30890fb745d71673..2b738dde6e90bbc9811d50840384c06572391c80 100644 (file)
--- 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()) {