From 5ffec58a8f5424426df93e47e04a24ed95e5aab0 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 27 Aug 2019 13:03:03 +0200 Subject: [PATCH] Fix blocking of concurrent instances in PHP >7.2 (bug #703) --- adminer/include/functions.inc.php | 6 +++++- changes.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index c8d986521..787ab79be 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -566,8 +566,12 @@ function restart_session() { * @return null */ function stop_session($force = false) { - if (!ini_bool("session.use_cookies") || ($force && @ini_set("session.use_cookies", false) !== false)) { // @ - may be disabled + $use_cookies = ini_bool("session.use_cookies"); + if (!$use_cookies || $force) { session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later + if ($use_cookies && @ini_set("session.use_cookies", false) === false) { // @ - may be disabled + session_start(); + } } } diff --git a/changes.txt b/changes.txt index 15d4fa423..c209b6584 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,6 @@ Adminer 4.7.3-dev: Allow editing foreign keys pointing to tables in other database/schema (bug #694) +Fix blocking of concurrent instances in PHP >7.2 (bug #703) MySQL: Speed up displaying tables in large databases (bug #700, regression from 4.7.2) MySQL: Allow editing rows identified by negative floats (bug #695) MySQL: Skip editing generated columns