From 6bbebf091408290fb5c6349a92e5a9de3a0a880f Mon Sep 17 00:00:00 2001
From: Christian Göttsche
Date: Sun, 26 Nov 2023 19:41:43 +0100
Subject: Add condition for mysqli.reconnect

mysqli.reconnect has been removed in PHP 8.2, see
https://www.php.net/manual/de/mysqli.configuration.php#ini.mysqli.reconnect.
---
 config/ini_protection.rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/ini_protection.rules b/config/ini_protection.rules
index 9b42a18..0e5781c 100644
--- a/config/ini_protection.rules
+++ b/config/ini_protection.rules
@@ -188,8 +188,9 @@ sp.ini.key("mysqli.default_socket").ro();
 sp.ini.key("mysqli.default_user").ro();
 sp.ini.key("mysqli.max_links").set("-1").ro();
 sp.ini.key("mysqli.max_persistent").set("-1").ro();
-sp.ini.key("mysqli.reconnect").set("0").ro();
 sp.ini.key("mysqli.rollback_on_cached_plink").set("0").ro();
+@condition extension_loaded("mysqli") && PHP_VERSION_ID < 80200;
+sp.ini.key("mysqli.reconnect").set("0").ro();
 @condition extension_loaded("mysqlnd");
 sp.ini.key("mysqlnd.collect_memory_statistics").set("0").ro();
 sp.ini.key("mysqlnd.collect_statistics").set("1").ro();
-- 
cgit v1.3


From 3b3a779cac152da36a516566bd6942c6bf90a3fb Mon Sep 17 00:00:00 2001
From: Julien Voisin
Date: Mon, 27 Nov 2023 23:15:36 +0000
Subject: Update config/ini_protection.rules

---
 config/ini_protection.rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/ini_protection.rules b/config/ini_protection.rules
index 0e5781c..971941a 100644
--- a/config/ini_protection.rules
+++ b/config/ini_protection.rules
@@ -191,6 +191,7 @@ sp.ini.key("mysqli.max_persistent").set("-1").ro();
 sp.ini.key("mysqli.rollback_on_cached_plink").set("0").ro();
 @condition extension_loaded("mysqli") && PHP_VERSION_ID < 80200;
 sp.ini.key("mysqli.reconnect").set("0").ro();
+@end_condition
 @condition extension_loaded("mysqlnd");
 sp.ini.key("mysqlnd.collect_memory_statistics").set("0").ro();
 sp.ini.key("mysqlnd.collect_statistics").set("1").ro();
-- 
cgit v1.3