Reseet EG(active) a bit early.
authorDmitry Stogov <dmitry@zend.com>
Fri, 23 Jun 2017 11:58:19 +0000 (14:58 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 23 Jun 2017 11:58:19 +0000 (14:58 +0300)
Zend/zend_execute_API.c

index 3c453e64efbfdbb1656fb873933eb77b699a0553..fec7f73f5758fff665c94263dbaa6046648eb40b 100644 (file)
@@ -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;
 }
 /* }}} */