From 2840567e9f384be1f5ce36d67616a3fb746c8237 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Fri, 2 Apr 2010 13:25:49 +0000
Subject: [PATCH] Respect session.auto_start (bug #2967284)

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1360 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/include/bootstrap.inc.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index ec4d19d0..38668f4c 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -43,15 +43,16 @@ if (!isset($_SERVER["REQUEST_URI"])) {
 	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"] . ($_SERVER["QUERY_STRING"] != "" ? "?$_SERVER[QUERY_STRING]" : "");
 }
 
-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"] && strcasecmp($_SERVER["HTTPS"], "off"));
-if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-	$params[] = true; // HttpOnly
+if (!ini_get("session.auto_start")) {
+	session_name("adminer_sid"); // use specific session name to get own namespace
+	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off"));
+	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();
 }
-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()) {