com php-src: Revert "Removed redundand code": ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Tue, 28 Aug 2018 08:51:08 +0000 |
| Subject: | com php-src: Revert "Removed redundand code": ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102907@lists.php.net to get a copy of this message | ||
Commit: 4151a3fa647c809fadc4f2cf651454a4a89ec917
Author: Dmitry Stogov <dmitry@zend.com> Tue, 28 Aug 2018 11:51:08 +0300
Parents: dff0d81ce6da304460849852ff5422291c288698
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4151a3fa647c809fadc4f2cf651454a4a89ec917
Log:
Revert "Removed redundand code"
This reverts commit 57e2b7d53b1d5de0a2eed6596faa9398b4dffc1c.
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 7ba5122..bbdda94 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1659,6 +1659,7 @@ static void zend_accel_init_auto_globals(void)
static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handle, int type, const
char *key, zend_op_array **op_array_p)
{
zend_persistent_script *new_persistent_script;
+ zend_op_array *orig_active_op_array;
HashTable *orig_class_table;
zval orig_user_error_handler;
zend_op_array *op_array;
@@ -1722,6 +1723,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle
*file_handl
new_persistent_script = create_persistent_script();
/* Save the original values for the op_array, function table and class table */
+ orig_active_op_array = CG(active_op_array);
orig_class_table = CG(class_table);
ZVAL_COPY_VALUE(&orig_user_error_handler, &EG(user_error_handler));
@@ -1750,6 +1752,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle
*file_handl
} zend_end_try();
/* Restore originals */
+ CG(active_op_array) = orig_active_op_array;
EG(class_table) = CG(class_table) = orig_class_table;
EG(user_error_handler) = orig_user_error_handler;