Return early on php display error for better legibility

Closes GH-6760

Signed-off-by: George Peter Banyard <girgias@php.net>

diff --git a/main/main.c b/main/main.c
index ac7170c88aacd667ddb36287431a574e9ff73f84..144586e37202907f651adbc58a3827a5acf8c3fc 100644 (file)
--- 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;