From fde2e61d544cdb2afe4594808b75ed6d174066cf Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 30 Jun 2000 11:45:32 +0000 Subject: [PATCH] error_reporting fix --- Zend/zend_builtin_functions.c | 2 +- Zend/zend_execute_API.c | 4 ++++ Zend/zend_globals.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 32ecc6f0b8..a4ff6ad6c7 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -342,7 +342,7 @@ ZEND_FUNCTION(error_reporting) WRONG_PARAM_COUNT; break; } - + RETVAL_LONG(old_error_reporting); } diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index b646aa0184..f1617448d5 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -145,6 +145,8 @@ void init_executor(CLS_D ELS_DC) zend_ptr_stack_init(&EG(user_error_handlers)); + EG(orig_error_reporting) = EG(error_reporting); + #ifdef ZEND_WIN32 EG(timed_out) = 0; #endif @@ -203,6 +205,8 @@ void shutdown_executor(ELS_D) zend_ptr_stack_clean(&EG(user_error_handlers), ZVAL_DESTRUCTOR, 1); zend_ptr_stack_destroy(&EG(user_error_handlers)); + + EG(error_reporting) = EG(orig_error_reporting); } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 9c89e3c78e..eafd922fd3 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -150,6 +150,7 @@ struct _zend_executor_globals { jmp_buf bailout; int error_reporting; + int orig_error_reporting; zend_op_array *active_op_array; zend_op_array *main_op_array; -- 2.40.0