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 f9048dada36a51047d94572d0d34255c54dba515..a60fff3bcb0de108dc4c26c9cb315d7d2dde8d9a 100644 (file)
--- 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;
        }