Re: cvs: php-src / NEWS /main main.c

That looks wrong, stuff that may be necessary for reporting this error may not be initialized before module_initialized is on. Please revert or explain why you think it's no longer necessary :) Zeev At 19:00 15/02/2004, Marcus Boerger wrote:

helly           Sun Feb 15 12:00:43 2004 EDT

Modified files:

    /php-src/main       main.c
    /php-src    NEWS

Log: Fix startup errors http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.592&r2=1.593&ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.592 php-src/main/main.c:1.593 --- php-src/main/main.c:1.592 Thu Feb 12 05:43:27 2004 +++ php-src/main/main.c Sun Feb 15 12:00:41 2004 @@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: main.c,v 1.592 2004/02/12 10:43:27 zeev Exp $ */ +/* $Id: main.c,v 1.593 2004/02/15 17:00:41 helly Exp $ */ /* {{{ includes */ @@ -751,8 +751,8 @@

                        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);

http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1609&r2=1.1610&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1609 php-src/NEWS:1.1610 --- php-src/NEWS:1.1609 Sat Feb 14 11:25:20 2004

+++ php-src/NEWS        Sun Feb 15 12:00:42 2004

@@ -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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php