From 53af6a569925cabd3d93763bc99eec38b2a883bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 26 Jul 2016 16:04:56 +0200
Subject: [PATCH] Simplify session handling on possibly long requests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We really do not have to reconfigure sessions on restarting them.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/Config.php             |  4 ----
 libraries/VersionInformation.php | 13 +++----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libraries/Config.php b/libraries/Config.php
index 5f55795ac9..c1ed5b67ba 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -734,10 +734,6 @@ class Config
         }
         $data = @curl_exec($handle);
         if (! defined('TESTSUITE')) {
-            ini_set('session.use_only_cookies', '0');
-            ini_set('session.use_cookies', '0');
-            ini_set('session.use_trans_sid', '0');
-            ini_set('session.cache_limiter', 'nocache');
             session_start();
         }
         if ($data === false) {
diff --git a/libraries/VersionInformation.php b/libraries/VersionInformation.php
index 49e5e4ce4d..d174d01e96 100644
--- a/libraries/VersionInformation.php
+++ b/libraries/VersionInformation.php
@@ -47,6 +47,9 @@ class VersionInformation
             $response = $_SESSION['cache']['version_check']['response'];
         } else {
             $save = true;
+            if (! defined('TESTSUITE')) {
+                session_write_close();
+            }
             $file = 'https://www.phpmyadmin.net/home_page/version.json';
             if (ini_get('allow_url_fopen')) {
                 $context = array(
@@ -56,9 +59,6 @@ class VersionInformation
                     )
                 );
                 $context = Util::handleContext($context);
-                if (! defined('TESTSUITE')) {
-                    session_write_close();
-                }
                 $response = file_get_contents(
                     $file,
                     false,
@@ -85,9 +85,6 @@ class VersionInformation
                     CURLOPT_TIMEOUT,
                     $connection_timeout
                 );
-                if (! defined('TESTSUITE')) {
-                    session_write_close();
-                }
                 $response = curl_exec($curl_handle);
             }
         }
@@ -106,10 +103,6 @@ class VersionInformation
 
         if ($save) {
             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', 'nocache');
                 session_start();
             }
             $_SESSION['cache']['version_check'] = array(