summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-03-14 23:56:07 +0000
committerMarcus Boerger <helly@php.net>2004-03-14 23:56:07 +0000
commit97b5bb474e027643278ae4358d8fc69bf502d0eb (patch)
tree1e6eb1808ba6c257daf8a04c1ef7498d59e9f8cc /main/main.c
parent04a242541bdcd67e7abc12d0b044cf68516fa4b3 (diff)
downloadphp-git-97b5bb474e027643278ae4358d8fc69bf502d0eb.tar.gz
Guard display_startup_errors with checking for default (working) output
functions.
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/main/main.c b/main/main.c
index 30698a5925..83c8633c69 100644
--- a/main/main.c
+++ b/main/main.c
@@ -752,7 +752,12 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
efree(log_buffer);
}
if (PG(display_errors)
- && ((!PG(during_request_startup) && PG(display_startup_errors)) || module_initialized)) {
+ && ((module_initialized && !PG(during_request_startup))
+ || (PG(display_startup_errors)
+ && (OG(php_body_write)==php_default_output_func || OG(php_body_write)==php_ub_body_write_no_header || OG(php_body_write)==php_ub_body_write)
+ )
+ )
+ ) {
if (PG(xmlrpc_errors)) {
php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>%ld</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %d</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);