cvs: Zend(PHP_4_3) / zend.c
| From: | Andrei Zmievski | Date: | Tue, 01 Jun 2004 16:53:55 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2678@lists.php.net to get a copy of this message | ||
andrei Tue Jun 1 12:53:55 2004 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend.c
Log:
MFH (If user error handler returns "false" then we relay to the built in
error handler)
http://cvs.php.net/diff.php/Zend/zend.c?r1=1.162.2.18&r2=1.162.2.19&ty=u
Index: Zend/zend.c
diff -u Zend/zend.c:1.162.2.18 Zend/zend.c:1.162.2.19
--- Zend/zend.c:1.162.2.18 Thu Apr 8 12:51:19 2004
+++ Zend/zend.c Tue Jun 1 12:53:54 2004
@@ -812,7 +812,12 @@
orig_user_error_handler = EG(user_error_handler);
EG(user_error_handler) = NULL;
if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5,
params, 1, NULL TSRMLS_CC)==SUCCESS) {
- zval_ptr_dtor(&retval);
+ if (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);
+ }
} else {
/* The user error handler failed, use built-in error handler */
zend_error_cb(type, error_filename, error_lineno, format, args);