diff options
| author | Calison <calisonsi@gmail.com> | 2021-03-07 16:21:13 -0300 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2021-03-14 14:25:26 +0000 |
| commit | 021c988a6fbd9659b9c4dade5fa171263b8d8c98 (patch) | |
| tree | 0ac1349f0e6d4b3ec2bab5a9cfc2a08f5056e1e8 /main | |
| parent | 8ff6dbb57cacf6a8e89a1be7bfd373207fbe03be (diff) | |
| download | php-git-021c988a6fbd9659b9c4dade5fa171263b8d8c98.tar.gz | |
Return early on php display error for better legibility
Closes GH-6760
Signed-off-by: George Peter Banyard <girgias@php.net>
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/main/main.c b/main/main.c index ac7170c88a..144586e372 100644 --- a/main/main.c +++ b/main/main.c @@ -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; |