Skip to content

Commit 021c988

Browse files
Calison25Girgias
authored andcommitted
Return early on php display error for better legibility
Closes GH-6760 Signed-off-by: George Peter Banyard <[email protected]>
1 parent 8ff6dbb commit 021c988

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

main/main.c

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -410,20 +410,25 @@ static zend_uchar php_get_display_errors_mode(char *value, size_t value_length)
410410
}
411411

412412
if (value_length == 2 && !strcasecmp("on", value)) {
413-
mode = PHP_DISPLAY_ERRORS_STDOUT;
414-
} else if (value_length == 3 && !strcasecmp("yes", value)) {
415-
mode = PHP_DISPLAY_ERRORS_STDOUT;
416-
} else if (value_length == 4 && !strcasecmp("true", value)) {
417-
mode = PHP_DISPLAY_ERRORS_STDOUT;
418-
} else if (value_length == 6 && !strcasecmp(value, "stderr")) {
419-
mode = PHP_DISPLAY_ERRORS_STDERR;
420-
} else if (value_length == 6 && !strcasecmp(value, "stdout")) {
421-
mode = PHP_DISPLAY_ERRORS_STDOUT;
422-
} else {
423-
ZEND_ATOL(mode, value);
424-
if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) {
425-
mode = PHP_DISPLAY_ERRORS_STDOUT;
426-
}
413+
return PHP_DISPLAY_ERRORS_STDOUT;
414+
}
415+
if (value_length == 3 && !strcasecmp("yes", value)) {
416+
return PHP_DISPLAY_ERRORS_STDOUT;
417+
}
418+
419+
if (value_length == 4 && !strcasecmp("true", value)) {
420+
return PHP_DISPLAY_ERRORS_STDOUT;
421+
}
422+
if (value_length == 6 && !strcasecmp(value, "stderr")) {
423+
return PHP_DISPLAY_ERRORS_STDERR;
424+
}
425+
if (value_length == 6 && !strcasecmp(value, "stdout")) {
426+
return PHP_DISPLAY_ERRORS_STDOUT;
427+
}
428+
429+
ZEND_ATOL(mode, value);
430+
if (mode && mode != PHP_DISPLAY_ERRORS_STDOUT && mode != PHP_DISPLAY_ERRORS_STDERR) {
431+
return PHP_DISPLAY_ERRORS_STDOUT;
427432
}
428433

429434
return mode;

0 commit comments

Comments
 (0)