From 866d3b40e9b720f74f12d451d824a27e241abf93 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 23 Jun 2017 14:58:19 +0300 Subject: [PATCH] Reseet EG(active) a bit early. --- Zend/zend_execute_API.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 3c453e64ef..fec7f73f57 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -266,13 +266,13 @@ void shutdown_executor(void) /* {{{ */ /* All resources and objects are destroyed. */ /* No PHP callback functions may be called after this point. */ + EG(active) = 0; + EG(valid_symbol_table) = 0; zend_try { zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator); } zend_end_try(); - EG(valid_symbol_table) = 0; - if (fast_shutdown) { /* Fast Request Shutdown * ===================== @@ -392,8 +392,6 @@ void shutdown_executor(void) /* {{{ */ zend_cleanup_internal_classes(); zend_shutdown_fpu(); - - EG(active) = 0; } /* }}} */ -- 2.50.1