clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return early on php display error for better legibility

Browse Source 
Closes GH-6760

Signed-off-by: George Peter Banyard <girgias@php.net>
This commit is contained in:
Calison 2021-03-07 16:21:13 -03:00 committed by George Peter Banyard
parent 8ff6dbb57c
commit 021c988a6f
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
main/main.c
View File

@ -410,20 +410,25 @@ static zend_uchar php_get_display_errors_mode(char *value, size_t value_length)
}
if (value_length == 2 && !strcasecmp("on", value)) {
mode = PHP_DISPLAY_ERRORS_STDOUT;
} else if (value_length == 3 && !strcasecmp("yes", value)) {
mode = PHP_DISPLAY_ERRORS_STDOUT;
} else if (value_length == 4 && !strcasecmp("true", value)) {
mode = PHP_DISPLAY_ERRORS_STDOUT;
} else if (value_length == 6 && !strcasecmp(value, "stderr")) {
mode = PHP_DISPLAY_ERRORS_STDERR;
} else if (value_length == 6 && !strcasecmp(value, "stdout")) {
mode = PHP_DISPLAY_ERRORS_STDOUT;
} else {
ZEND_ATOL(mode, value);
if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) {
mode = PHP_DISPLAY_ERRORS_STDOUT;
}
return PHP_DISPLAY_ERRORS_STDOUT;
}
if (value_length == 3 && !strcasecmp("yes", value)) {
return PHP_DISPLAY_ERRORS_STDOUT;
}
if (value_length == 4 && !strcasecmp("true", value)) {
return PHP_DISPLAY_ERRORS_STDOUT;
}
if (value_length == 6 && !strcasecmp(value, "stderr")) {
return PHP_DISPLAY_ERRORS_STDERR;
}
if (value_length == 6 && !strcasecmp(value, "stdout")) {
return PHP_DISPLAY_ERRORS_STDOUT;
}
ZEND_ATOL(mode, value);
if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) {
return PHP_DISPLAY_ERRORS_STDOUT;
}
return mode;