cvs: ZendEngine2 / zend_execute.c
| From: | Andi Gutmans | Date: | Thu, 27 May 2004 11:59:59 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2669@lists.php.net to get a copy of this message | ||
andi Thu May 27 07:59:59 2004 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
- Fix problem with exceptions returning from include(). (Dmitry)
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.645&r2=1.646&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.645 ZendEngine2/zend_execute.c:1.646
--- ZendEngine2/zend_execute.c:1.645 Mon May 17 20:04:22 2004
+++ ZendEngine2/zend_execute.c Thu May 27 07:59:58 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.645 2004/05/18 00:04:22 pollita Exp $ */
+/* $Id: zend_execute.c,v 1.646 2004/05/27 11:59:58 andi Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -3574,6 +3574,9 @@
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);