summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2009-01-02 13:14:49 +0000
committerMarcus Boerger <helly@php.net>2009-01-02 13:14:49 +0000
commit2aba36846259e162cfd4baf721358471bf5062ca (patch)
tree68a7dde6a9506fcfc4b72e7337942de23d6b5b3a /Zend/zend_execute_API.c
parent46dc120cdc478225eb02411fb7e40d40d81ea35d (diff)
downloadphp-git-2aba36846259e162cfd4baf721358471bf5062ca.tar.gz
- MFH Catch exceptions in cli -a
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 46e8ef73ee..3bdfc5b6e0 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1184,7 +1184,7 @@ ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name,
result = zend_eval_string(str, retval_ptr, string_name TSRMLS_CC);
if (handle_exceptions && EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
result = FAILURE;
}
return result;
@@ -1253,7 +1253,7 @@ void execute_new_code(TSRMLS_D) /* {{{ */
zend_execute(CG(active_op_array) TSRMLS_CC);
if (EG(exception)) {
- zend_exception_error(EG(exception) TSRMLS_CC);
+ zend_exception_error(EG(exception), E_ERROR TSRMLS_CC);
}
CG(active_op_array)->last -= 1; /* get rid of that ZEND_RETURN */