Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend.c

I think it's OK to add. At 09:26 AM 6/1/2004 -0700, Andrei Zmievski wrote:

Should we add this to PHP 4 as well? On Tue, 01 Jun 2004, Andi Gutmans wrote:

andi          Tue Jun  1 07:45:46 2004 EDT

Modified files:

    /ZendEngine2      zend.c

Log: - If user error handler returns "false" then we relay to the built in error

    handler

http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.284&r2=1.285&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.284 ZendEngine2/zend.c:1.285 --- ZendEngine2/zend.c:1.284 Fri May 28 13:28:33 2004

+++ ZendEngine2/zend.c        Tue Jun  1 07:45:46 2004

@@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.284 2004/05/28 17:28:33 andrei Exp $ */ +/* $Id: zend.c,v 1.285 2004/06/01 11:45:46 andi Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -974,7 +974,7 @@

                      if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC)==SUCCESS) {
                              if (retval) {
-                                     if (Z_TYPE_P(retval) != IS_NULL && !zend_is_true(retval)) {
+                                     if (Z_TYPE_P(retval) == IS_BOOL && Z_LVAL_P(retval) == 0) {
                                              zend_error_cb(type, error_filename, error_lineno, format, args);
                                      }
                                      zval_ptr_dtor(&retval);

-- Zend Engine CVS Mailing List (http://cvs.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php - Andrei