summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2007-10-18 13:11:30 +0000
committerDmitry Stogov <dmitry@php.net>2007-10-18 13:11:30 +0000
commit168f127abbfd68bf76b1d724700919370026ea40 (patch)
treedc7ca8ea49097ab381ad7dc91d0fe5a0a73a143a /main
parent2e2a566c15a7e0b34343408c78d638896111f154 (diff)
downloadphp-git-168f127abbfd68bf76b1d724700919370026ea40.tar.gz
Fixed bug #42722 (display_errors setting ignored for E_PARSE and HTTP 500 page)
Diffstat (limited to 'main')
-rw-r--r--main/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 6ffc8f71cf..5438197955 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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};