diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-03-27 22:07:38 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-03-27 22:07:38 +0000 |
| commit | a93bd9d4931d04f3d560c9c2bdd3b6259b340540 (patch) | |
| tree | 6e5d2ee2fb45e00fc4bb31c2023c312c48328b9b | |
| parent | c5df14364b8178ba5557308e1ebbfadae2d94453 (diff) | |
| download | php-git-a93bd9d4931d04f3d560c9c2bdd3b6259b340540.tar.gz | |
fix #36878 (error messages are printed even though an exception has been thrown)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/zend.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -11,6 +11,8 @@ PHP NEWS - Removed the E_STRICT deprecation notice from "var". (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) - Fixed SoapFault::getMessage(). (Dmitry) +- Fixed bug #36878 (error messages are printed even though an exception has + been thrown). (Tony) - Fixed bug #36869 (memory leak in output buffering when using chunked output). (Tony) - Fixed bug #36859 (DOMElement crashes when calling __construct when diff --git a/Zend/zend.c b/Zend/zend.c index bab26af0d6..366cd21c78 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1025,7 +1025,7 @@ ZEND_API void zend_error(int type, const char *format, ...) } zval_ptr_dtor(&retval); } - } else { + } else if (!EG(exception)) { /* The user error handler failed, use built-in error handler */ zend_error_cb(type, error_filename, error_lineno, format, args); } |