diff options
| -rw-r--r-- | Zend/zend.c | 4 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 8 | ||||
| -rw-r--r-- | Zend/zend_exceptions.h | 4 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index f3b702c867..683dd298c9 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1199,10 +1199,10 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co } } else { zend_exception_restore(TSRMLS_C); - zend_exception_error(EG(exception) TSRMLS_CC); + zend_exception_error(EG(exception), E_ERROR TSRMLS_CC); } } else { - zend_exception_error(EG(exception) TSRMLS_CC); + zend_exception_error(EG(exception), E_ERROR TSRMLS_CC); } } destroy_op_array(EG(active_op_array) TSRMLS_CC); diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 55377bfe11..369cf9c05c 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -739,8 +739,8 @@ static void zend_error_va(int type, const char *file, uint lineno, const char *f } /* }}} */ -/* This function doesn't return as it calls E_ERROR */ -ZEND_API void zend_exception_error(zval *exception TSRMLS_DC) /* {{{ */ +/* This function doesn't return if it uses E_ERROR */ +ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {{{ */ { zend_class_entry *ce_exception = Z_OBJCE_P(exception); if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) { @@ -774,9 +774,9 @@ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC) /* {{{ */ file = zend_read_property(default_exception_ce, exception, "file", sizeof("file")-1, 1 TSRMLS_CC); line = zend_read_property(default_exception_ce, exception, "line", sizeof("line")-1, 1 TSRMLS_CC); - zend_error_va(E_ERROR, Z_STRVAL_P(file), Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str)); + zend_error_va(severity, Z_STRVAL_P(file), Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str)); } else { - zend_error(E_ERROR, "Uncaught exception '%s'", ce_exception->name); + zend_error(severity, "Uncaught exception '%s'", ce_exception->name); } } /* }}} */ diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index 5a8885f5d0..3c826e5510 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -49,8 +49,8 @@ ZEND_API zval * zend_throw_error_exception(zend_class_entry *exception_ce, char extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC); -/* show an exception using zend_error(E_ERROR,...) */ -ZEND_API void zend_exception_error(zval *exception TSRMLS_DC); +/* show an exception using zend_error(severity,...), severity should be E_ERROR */ +ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC); /* do not export, in php it's available thru spprintf directly */ int zend_spprintf(char **message, int max_len, char *format, ...); 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 */ diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 519217fa24..3b72f9469f 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1123,7 +1123,7 @@ int main(int argc, char *argv[]) } if (EG(exception)) { - zend_exception_error(EG(exception) TSRMLS_CC); + zend_exception_error(EG(exception), E_WARNING TSRMLS_CC); } php_last_char = '\0'; |