diff options
| author | Xinchen Hui <laruence@php.net> | 2012-02-08 03:03:05 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-02-08 03:03:05 +0000 |
| commit | 27df8b6ff005a96ca64823706bf1016309fd9c9d (patch) | |
| tree | 42ea44178d985466e740f98122b86ae3f408ba95 | |
| parent | 206f123bd3045a3e19620e89e6616fc0940c0a07 (diff) | |
| download | php-git-27df8b6ff005a96ca64823706bf1016309fd9c9d.tar.gz | |
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
| -rw-r--r-- | Zend/zend_execute_API.c | 8 |
1 files changed, 2 insertions, 6 deletions
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; } |