Fix blocking of concurrent instances in PHP >7.2 (bug #703)

vrana · Aug 27, 2019 · 5ffec58 · 5ffec58
1 parent 34a0bfd
commit 5ffec58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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