From: Xinchen Hui <laruence@php.net>
Date: Wed, 8 Feb 2012 03:03:05 +0000 (+0000)
Subject: Revert -r319102 and -r322922 in 5.4 branch since they introduce #60978
X-Git-Tag: php-5.4.0RC8~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27df8b6ff005a96ca64823706bf1016309fd9c9d;p=php

Revert -r319102 and -r322922 in 5.4 branch since they introduce #60978
Fixed #60978 in trunk without reverting previous fix
#see http://news.php.net/php.internals/57789
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f9048dada3..a60fff3bcb 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1195,12 +1195,7 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
 		}
 		CG(interactive) = 0;
 
-		retval = SUCCESS;
-		zend_try {
-			zend_execute(new_op_array TSRMLS_CC);
-		} zend_catch {
-			retval = FAILURE;
-		} zend_end_try();
+		zend_execute(new_op_array TSRMLS_CC);
 
 		CG(interactive) = orig_interactive;
 		if (local_retval_ptr) {
@@ -1221,6 +1216,7 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
 		destroy_op_array(new_op_array TSRMLS_CC);
 		efree(new_op_array);
 		EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
+		retval = SUCCESS;
 	} else {
 		retval = FAILURE;
 	}