cvs: ZendEngine2 / zend.c
| From: | Andrei Zmievski | Date: | Fri, 28 May 2004 17:28:33 +0000 |
| Subject: | cvs: ZendEngine2 / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2672@lists.php.net to get a copy of this message | ||
andrei Fri May 28 13:28:33 2004 EDT
Modified files:
/ZendEngine2 zend.c
Log:
Allow user-defined error handlers to indicate whether default error
handler should be re-invoked, by returning true or false.
http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.283&r2=1.284&ty=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.283 ZendEngine2/zend.c:1.284
--- ZendEngine2/zend.c:1.283 Sat Apr 17 10:02:40 2004
+++ ZendEngine2/zend.c Fri May 28 13:28:33 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.c,v 1.283 2004/04/17 14:02:40 helly Exp $ */
+/* $Id: zend.c,v 1.284 2004/05/28 17:28:33 andrei Exp $ */
#include "zend.h"
#include "zend_extensions.h"
@@ -974,6 +974,9 @@
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)) {
+ zend_error_cb(type, error_filename, error_lineno, format, args);
+ }
zval_ptr_dtor(&retval);
}
} else {