]> 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:12:01 +0000 (13:12 +0000)
committerDmitry Stogov <dmitry@php.net>
Thu, 18 Oct 2007 13:12:01 +0000 (13:12 +0000)
main/main.c

index 9ef702f123beefa1b02571e2522c4d26acc9bd45..998e351eeb68da1ea6a1d3f9e31bec0d7c93671f 100644 (file)
@@ -1070,7 +1070,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};