archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Remove no longer used "log_errors_max_len" ini directive (#6838)"

Browse source 
This reverts commit cc2c810dcf.
This commit is contained in:
Ben Ramsey 2021-05-08 12:53:50 -05:00
parent 5fb03758e5
commit b5d5d06ff3
No known key found for this signature in database
GPG key ID: F9C39DC0B9698544
12 changed files with 29 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/ftp/tests/bug80901.phpt
View file

@ -3,6 +3,8 @@ Bug #80901 (Info leak in ftp extension)
--EXTENSIONS--
ftp
pcntl
--INI--
log_errors_max_len=0
--FILE--
<?php
$bug80901 = true;

2
ext/oci8/tests/error3.phpt
View file

@ -10,6 +10,8 @@ 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

2
ext/standard/tests/dir/bug80960.phpt
View file

@ -4,6 +4,8 @@ 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*");

5
ext/standard/tests/file/parse_ini_file_variation3.phpt
View file

@ -33,6 +33,7 @@ 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
@ -68,7 +69,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(9) {
array(10) {
["error_reporting"]=>
string(5) "32767"
["display_errors"]=>
@ -77,6 +78,8 @@ array(9) {
string(0) ""
["log_errors"]=>
string(0) ""
["log_errors_max_len"]=>
string(4) "1024"
["ignore_repeated_errors"]=>
string(0) ""
["ignore_repeated_source"]=>

2
ext/standard/tests/strings/006.phpt
View file

@ -1,5 +1,7 @@
--TEST--
highlight_file() and output buffer
--INI--
log_errors_max_len=4096
--FILE--
<?php

2
ext/standard/tests/strings/007-win32.phpt
View file

@ -2,6 +2,8 @@
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__));

2
ext/standard/tests/strings/007.phpt
View file

@ -2,6 +2,8 @@
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__));

1
main/main.c
View file

@ -662,6 +662,7 @@ 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)

1
main/php_globals.h
View file

@ -68,6 +68,7 @@ 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;

5
php.ini-development
View file

@ -519,6 +519,11 @@ 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

5
php.ini-production
View file

@ -521,6 +521,11 @@ 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

1
run-tests.php
View file

@ -296,6 +296,7 @@ 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',