summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-02-15 17:00:42 +0000
committerMarcus Boerger <helly@php.net>2004-02-15 17:00:42 +0000
commitb59989e716c5661059356f9ea61cda2e5cb22ba2 (patch)
tree0dc9501c26ec17886e5091d72216364b009485dc /main
parentc1418894dd1941abfa6fdb2a505a428f6c79f036 (diff)
downloadphp-git-b59989e716c5661059356f9ea61cda2e5cb22ba2.tar.gz
Fix startup errors
Diffstat (limited to 'main')
-rw-r--r--main/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.c b/main/main.c
index c12a659e71..e1265550d5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -751,8 +751,8 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
php_log_err(log_buffer TSRMLS_CC);
efree(log_buffer);
}
- if (module_initialized && PG(display_errors)
- && (!PG(during_request_startup) || PG(display_startup_errors))) {
+ if (PG(display_errors)
+ && ((!PG(during_request_startup) && PG(display_startup_errors)) || module_initialized)) {
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);