diff options
| author | Andi Gutmans <andi@php.net> | 2004-05-27 11:59:58 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2004-05-27 11:59:58 +0000 |
| commit | bca3e30484ffc9552566bee61fd096d53dadbe5e (patch) | |
| tree | 055b32e76d147494ade2ff2a742ccfc39ac102d8 | |
| parent | 5a9d648f1fed3b80a356dd7b5be5c7b430f7228d (diff) | |
| download | php-git-bca3e30484ffc9552566bee61fd096d53dadbe5e.tar.gz | |
- Fix problem with exceptions returning from include(). (Dmitry)
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |