From 3ccc0409ceb6d187b9fa5a3b599327ed3e59ff0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Sat, 8 May 2021 02:07:35 +0200
Subject: [PATCH] Remove no longer used "log_errors_max_len" ini directive
 (#6838)

This is a re-application of the original match against master.
The patch was originally applied to master, then reverted from
there, incorrectly applied to PHP-8.0, reverted from there due
to ABI break, and now lands on master again. We can only hope
that it does not get reverted again ;)
---
 UPGRADING                                              | 3 +++
 ext/ftp/tests/bug80901.phpt                            | 2 --
 ext/oci8/tests/error3.phpt                             | 2 --
 ext/standard/tests/dir/bug80960.phpt                   | 2 --
 ext/standard/tests/file/parse_ini_file_variation3.phpt | 5 +----
 ext/standard/tests/strings/006.phpt                    | 2 --
 ext/standard/tests/strings/007-win32.phpt              | 2 --
 ext/standard/tests/strings/007.phpt                    | 2 --
 main/main.c                                            | 1 -
 main/php_globals.h                                     | 1 -
 php.ini-development                                    | 5 -----
 php.ini-production                                     | 5 -----
 run-tests.php                                          | 1 -
 13 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 76cb7821788..678d433e7d0 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -384,6 +384,9 @@ PHP 8.1 UPGRADE NOTES
 11. Changes to INI File Handling
 ========================================
 
+- The log_errors_max_len ini setting has been removed. It no longer had an
+  effect since PHP 8.0.
+
 ========================================
 12. Windows Support
 ========================================
diff --git a/ext/ftp/tests/bug80901.phpt b/ext/ftp/tests/bug80901.phpt
index 58670dfb30d..e2a58fa0668 100644
--- a/ext/ftp/tests/bug80901.phpt
+++ b/ext/ftp/tests/bug80901.phpt
@@ -3,8 +3,6 @@ Bug #80901 (Info leak in ftp extension)
 --EXTENSIONS--
 ftp
 pcntl
---INI--
-log_errors_max_len=0
 --FILE--
 <?php
 $bug80901 = true;
diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt
index 0da7a43d386..8df2e512e75 100644
--- a/ext/oci8/tests/error3.phpt
+++ b/ext/oci8/tests/error3.phpt
@@ -10,8 +10,6 @@ if ($cv[0] < 11 || ($cv[0] == 11 && $cv[1] < 2) || ($cv[0] == 11 && $cv[1] == 2
     die("skip test works only with Oracle 11.2.0.3 or greater version of Oracle client libraries");
 }
 ?>
---INI--
-log_errors_max_len=4096
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/dir/bug80960.phpt b/ext/standard/tests/dir/bug80960.phpt
index ff3cbe435a9..43d01465599 100644
--- a/ext/standard/tests/dir/bug80960.phpt
+++ b/ext/standard/tests/dir/bug80960.phpt
@@ -4,8 +4,6 @@ Fix #80960 (opendir() warning wrong info when failed on Windows)
 <?php
 if (PHP_OS_FAMILY !== "Windows") die("skip for Windows only");
 ?>
---INI--
-log_errors_max_len=0
 --FILE--
 <?php
 opendir("notexist*");
diff --git a/ext/standard/tests/file/parse_ini_file_variation3.phpt b/ext/standard/tests/file/parse_ini_file_variation3.phpt
index 81aeb46d02f..b3f565af89d 100644
--- a/ext/standard/tests/file/parse_ini_file_variation3.phpt
+++ b/ext/standard/tests/file/parse_ini_file_variation3.phpt
@@ -33,7 +33,6 @@ error_reporting  =  E_ALL
 display_errors = On
 display_startup_errors = Off
 log_errors = Off
-log_errors_max_len = 1024
 ignore_repeated_errors = Off
 ignore_repeated_source = Off
 report_memleaks = On
@@ -69,7 +68,7 @@ foreach($newdirs as $newdir) {
 --EXPECTF--
 *** Testing parse_ini_file() : variation ***
 New include path is : %sparse_ini_file_variation3.dir1%sparse_ini_file_variation3.dir2%sparse_ini_file_variation3.dir3%S
-array(10) {
+array(9) {
   ["error_reporting"]=>
   string(5) "32767"
   ["display_errors"]=>
@@ -78,8 +77,6 @@ array(10) {
   string(0) ""
   ["log_errors"]=>
   string(0) ""
-  ["log_errors_max_len"]=>
-  string(4) "1024"
   ["ignore_repeated_errors"]=>
   string(0) ""
   ["ignore_repeated_source"]=>
diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt
index 5f36d9aa8df..dabed24c578 100644
--- a/ext/standard/tests/strings/006.phpt
+++ b/ext/standard/tests/strings/006.phpt
@@ -1,7 +1,5 @@
 --TEST--
 highlight_file() and output buffer
---INI--
-log_errors_max_len=4096
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt
index 4dce8f0e137..9fe9e482139 100644
--- a/ext/standard/tests/strings/007-win32.phpt
+++ b/ext/standard/tests/strings/007-win32.phpt
@@ -2,8 +2,6 @@
 php_strip_whitespace() and output buffer
 --SKIPIF--
 <?php if( substr(PHP_OS, 0, 3) != "WIN") die('skip Windows only test');?>
---INI--
-log_errors_max_len=4096
 --FILE--
 <?php
 $file = str_repeat("A", PHP_MAXPATHLEN - strlen(__DIR__ . DIRECTORY_SEPARATOR . __FILE__));
diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt
index 7c0b7d16d0d..69140715b45 100644
--- a/ext/standard/tests/strings/007.phpt
+++ b/ext/standard/tests/strings/007.phpt
@@ -2,8 +2,6 @@
 php_strip_whitespace() and output buffer
 --SKIPIF--
 <?php if( substr(PHP_OS, 0, 3) == "WIN") die('skip Non windows test');?>
---INI--
-log_errors_max_len=4096
 --FILE--
 <?php
 $file = str_repeat("A", PHP_MAXPATHLEN - strlen(__DIR__ . DIRECTORY_SEPARATOR . __FILE__));
diff --git a/main/main.c b/main/main.c
index 5bfcd2b04c9..db17576fe4f 100644
--- a/main/main.c
+++ b/main/main.c
@@ -662,7 +662,6 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("ignore_user_abort",	"0",		PHP_INI_ALL,		OnUpdateBool,			ignore_user_abort,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("implicit_flush",		"0",		PHP_INI_ALL,		OnUpdateBool,			implicit_flush,			php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("log_errors",			"0",		PHP_INI_ALL,		OnUpdateBool,			log_errors,				php_core_globals,	core_globals)
-	STD_PHP_INI_ENTRY("log_errors_max_len",	 "1024",		PHP_INI_ALL,		OnUpdateLong,			log_errors_max_len,		php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("ignore_repeated_errors",	"0",	PHP_INI_ALL,		OnUpdateBool,			ignore_repeated_errors,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("ignore_repeated_source",	"0",	PHP_INI_ALL,		OnUpdateBool,			ignore_repeated_source,	php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("report_memleaks",		"1",		PHP_INI_ALL,		OnUpdateBool,			report_memleaks,		php_core_globals,	core_globals)
diff --git a/main/php_globals.h b/main/php_globals.h
index 06494a4470b..80152663f44 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -68,7 +68,6 @@ struct _php_core_globals {
 	zend_uchar display_errors;
 	bool display_startup_errors;
 	bool log_errors;
-	zend_long      log_errors_max_len;
 	bool ignore_repeated_errors;
 	bool ignore_repeated_source;
 	bool report_memleaks;
diff --git a/php.ini-development b/php.ini-development
index 0296767a774..98ef90da975 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -519,11 +519,6 @@ display_startup_errors = On
 ; https://php.net/log-errors
 log_errors = On
 
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-; https://php.net/log-errors-max-len
-log_errors_max_len = 1024
-
 ; Do not log repeated messages. Repeated errors must occur in same file on same
 ; line unless ignore_repeated_source is set true.
 ; https://php.net/ignore-repeated-errors
diff --git a/php.ini-production b/php.ini-production
index b14ed0c3bae..f7afc568aff 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -521,11 +521,6 @@ display_startup_errors = Off
 ; https://php.net/log-errors
 log_errors = On
 
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-; https://php.net/log-errors-max-len
-log_errors_max_len = 1024
-
 ; Do not log repeated messages. Repeated errors must occur in same file on same
 ; line unless ignore_repeated_source is set true.
 ; https://php.net/ignore-repeated-errors
diff --git a/run-tests.php b/run-tests.php
index b7eadf4da83..3c7189b24d2 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -296,7 +296,6 @@ function main(): void
         'precision=14',
         'serialize_precision=-1',
         'memory_limit=128M',
-        'log_errors_max_len=0',
         'opcache.fast_shutdown=0',
         'opcache.file_update_protection=0',
         'opcache.revalidate_freq=0',