From bca3e30484ffc9552566bee61fd096d53dadbe5e Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Thu, 27 May 2004 11:59:58 +0000 Subject: [PATCH] - Fix problem with exceptions returning from include(). (Dmitry) --- Zend/zend_execute.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 9dcfad533c..e16fb8600a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -3574,6 +3574,9 @@ int zend_include_or_eval_handler(ZEND_OPCODE_HANDLER_ARGS) EG(function_state_ptr) = &EX(function_state); destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); + if (EG(exception)) { + zend_throw_exception_internal(NULL TSRMLS_CC); + } } else { if (return_value_used) { ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); -- 2.50.1