diff options
| -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; |