Fix startup errors

diff --git a/NEWS b/NEWS
index 4a206ff7f09202993909a930e40b0169de5c2c81..0879e9442e17a137c0a9d5a48737df989e86d948 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5 Release Candidate 1
+- Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed zero bytes memory allocation when no extra ini files are found in the
   --with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double

diff --git a/main/main.c b/main/main.c
index c12a659e71c1fb5d74356a11b0719b7ce8c9dd36..e1265550d5d0218ddc10ab6281fdd0dbba764b81 100644 (file)
--- 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);