From 0cc9230bd310e4fcd3b109f048a0354ee1d0a903 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Wed, 22 Jan 2014 20:16:47 +0530
Subject: [PATCH] fix headers already sent warnings when using session_start()

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 libraries/Config.class.php | 12 ++++++++++--
 libraries/Util.class.php   | 17 +++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 25cacfaf4a..4ad4f2995d 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -753,9 +753,17 @@ class PMA_Config
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
         curl_setopt($ch, CURLOPT_USERAGENT, 'phpMyAdmin/' . PMA_VERSION);
         curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-        session_write_close();
+        if (! defined('TESTSUITE')) {
+            session_write_close();
+        }
         $data = @curl_exec($ch);
-        session_start();
+        if (! defined('TESTSUITE')) {
+            ini_set('session.use_only_cookies', false);
+            ini_set('session.use_cookies', false);
+            ini_set('session.use_trans_sid', false);
+            ini_set('session.cache_limiter', null);
+            session_start();
+        }
         if ($data === false) {
             return null;
         }
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 8d9fd8ea52..f8e297c0e6 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4204,7 +4204,9 @@ class PMA_Util
                             = 'Proxy-Authorization: Basic ' . $auth;
                     }
                 }
-                session_write_close();
+                if (! defined('TESTSUITE')) {
+                    session_write_close();
+                }
                 $response = file_get_contents(
                     $file,
                     false,
@@ -4242,7 +4244,9 @@ class PMA_Util
                     CURLOPT_TIMEOUT,
                     $connection_timeout
                 );
-                session_write_close();
+                if (! defined('TESTSUITE')) {
+                    session_write_close();
+                }
                 $response = curl_exec($curl_handle);
             }
         }
@@ -4253,13 +4257,18 @@ class PMA_Util
             && strlen($data->date)
             && $save
         ) {
-            session_start();
+            if (! isset($_SESSION) && ! defined('TESTSUITE')) {
+                ini_set('session.use_only_cookies', false);
+                ini_set('session.use_cookies', false);
+                ini_set('session.use_trans_sid', false);
+                ini_set('session.cache_limiter', null);
+                session_start();
+            }
             $_SESSION['cache']['version_check'] = array(
                 'response' => $response,
                 'timestamp' => time()
             );
         }
-
         return $data;
     }