Skip to content

Remove no longer used "log_errors_max_len" ini directive #6838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2021
Merged

Remove no longer used "log_errors_max_len" ini directive #6838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ext/ftp/tests/bug80901.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Bug #80901 (Info leak in ftp extension)
--EXTENSIONS--
ftp
pcntl
--INI--
log_errors_max_len=0
--FILE--
<?php
$bug80901 = true;
Expand Down
2 changes: 0 additions & 2 deletions ext/oci8/tests/error3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions ext/standard/tests/dir/bug80960.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*");
Expand Down
5 changes: 1 addition & 4 deletions ext/standard/tests/file/parse_ini_file_variation3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]=>
Expand All @@ -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"]=>
Expand Down
2 changes: 0 additions & 2 deletions ext/standard/tests/strings/006.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
--TEST--
highlight_file() and output buffer
--INI--
log_errors_max_len=4096
--FILE--
<?php

Expand Down
2 changes: 0 additions & 2 deletions ext/standard/tests/strings/007-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__));
Expand Down
2 changes: 0 additions & 2 deletions ext/standard/tests/strings/007.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__));
Expand Down
1 change: 0 additions & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion main/php_globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions php.ini-development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions php.ini-production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion run-tests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down