Moved ZCG(function_table) back into accel_acrivate. It should be unique per thread.

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 400db342f214e6ea2c97271c33d79f2158830fba..cf1e1ce7d3b3c6047018892c9c2dba5b3baa57fd 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2140,6 +2140,11 @@ static void accel_activate(void)
                return;
        }
 
+       if (!ZCG(function_table).nTableSize) {
+               zend_hash_init(&ZCG(function_table), zend_hash_num_elements(CG(function_table)), NULL, ZEND_FUNCTION_DTOR, 1);
+               zend_accel_copy_internal_functions();
+       }
+
        /* PHP-5.4 and above return "double", but we use 1 sec precision */
        ZCG(auto_globals_mask) = 0;
        ZCG(request_time) = (time_t)sapi_get_request_time();
@@ -2628,9 +2633,6 @@ static int accel_post_startup(void)
                }
        }
 
-       zend_hash_init(&ZCG(function_table), zend_hash_num_elements(CG(function_table)), NULL, ZEND_FUNCTION_DTOR, 1);
-       zend_accel_copy_internal_functions();
-
 /********************************************/
 /* End of non-SHM dependent initializations */
 /********************************************/