]> granicus.if.org Git - php/commitdiff
Fixed bug #42722 (display_errors setting ignored for E_PARSE and HTTP 500 page)
authorDmitry Stogov <dmitry@php.net>
Thu, 18 Oct 2007 13:11:30 +0000 (13:11 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 18 Oct 2007 13:11:30 +0000 (13:11 +0000)
main/main.c

index 6ffc8f71cfad50c33c3c463006d9c0b8b49f7eb7..5438197955b9cf0e9fe42eda3efede5960b498e1 100644 (file)
@@ -973,7 +973,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
                case E_USER_ERROR:
                        EG(exit_status) = 255;
                        if (module_initialized) {
-                               if (!SG(headers_sent) &&
+                               if (!PG(display_errors) &&
+                                   !SG(headers_sent) &&
                                        SG(sapi_headers).http_response_code == 200
                                ) {
                                        sapi_header_line ctr = {0};