Backport 91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 0d28e9d3a81d6c7d8bdf957718d7821503ed3e8a..91436d537e943d4a54d2111e026712c3bc60e878 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -1761,11 +1761,15 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
        int key_length;
        int from_shared_memory; /* if the script we've got is stored in SHM */
 
-       if (!file_handle->filename || !ZCG(enabled) || !accel_startup_ok) {
+       if (!file_handle->filename || !ZCG(accelerator_enabled)) {
                /* The Accelerator is disabled, act as if without the Accelerator */
+               ZCG(cache_opline) = NULL;
+               ZCG(cache_persistent_script) = NULL;
                return accelerator_orig_compile_file(file_handle, type);
 #ifdef HAVE_OPCACHE_FILE_CACHE
        } else if (file_cache_only) {
+               ZCG(cache_opline) = NULL;
+               ZCG(cache_persistent_script) = NULL;
                return file_cache_compile_file(file_handle, type);
 #endif
        } else if (!ZCG(accelerator_enabled) ||
@@ -1775,6 +1779,8 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
                        return file_cache_compile_file(file_handle, type);
                }
 #endif
+               ZCG(cache_opline) = NULL;
+               ZCG(cache_persistent_script) = NULL;
                return accelerator_orig_compile_file(file_handle, type);
        }
 
@@ -1801,10 +1807,14 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
                        /* try to find cached script by key */
                        key = accel_make_persistent_key(file_handle->filename, strlen(file_handle->filename), &key_length);
                        if (!key) {
+                               ZCG(cache_opline) = NULL;
+                               ZCG(cache_persistent_script) = NULL;
                                return accelerator_orig_compile_file(file_handle, type);
                        }
                        persistent_script = zend_accel_hash_str_find(&ZCSG(hash), key, key_length);
                } else if (UNEXPECTED(is_stream_path(file_handle->filename) && !is_cacheable_stream_path(file_handle->filename))) {
+                       ZCG(cache_opline) = NULL;
+                       ZCG(cache_persistent_script) = NULL;
                        return accelerator_orig_compile_file(file_handle, type);
                }