From 4f57c1e029ce9c24bd699ea61b05973c4665bc32 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 25 Oct 2018 15:29:58 +0300 Subject: [PATCH] Cleanup (move preload_shutdown() call to better place) --- ext/opcache/ZendAccelerator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 021cb2eb4bb4c..f78ecabe24cf0 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -567,10 +567,6 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int Bucket *p, *q; HashTable *ht; - if (ZCSG(preload_script)) { - preload_shutdown(); - } - /* empty string */ zend_empty_string = new_interned_string(zend_empty_string); for (j = 0; j < 256; j++) { @@ -774,6 +770,10 @@ static void accel_use_shm_interned_strings(void) static void accel_use_permanent_interned_strings(void) { + if (ZCSG(preload_script)) { + preload_shutdown(); + } + accel_copy_permanent_strings(accel_replace_string_by_process_permanent); }