diff --git a/NEWS b/NEWS index 95e47d2b34ad..a6555ac871c9 100644 --- a/NEWS +++ b/NEWS @@ -300,6 +300,8 @@ PHP NEWS . Fix opcache phar check. (ndossche) . Fixed bug GH-8739 (OPcache restart corrupts SHM in threaded SAPIs). (pavimus) + . Fixed opcache.enable_file_override lookups racing with OPcache restarts + (pavimus) - OpenSSL: . Fixed build and test compatibility with OpenSSL 4.0 and 4.1. diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 902d69374bb7..821dfbe39121 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -367,6 +367,12 @@ ZEND_INI_END() static int filename_is_in_cache(zend_string *filename) { zend_string *key; + int ret = 0; + + /* The hash may be cleaned by a restart: only look it up while holding the read lock */ + if (!ZCG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) { + return 0; + } key = accel_make_persistent_key(filename); if (key != NULL) { @@ -374,20 +380,20 @@ static int filename_is_in_cache(zend_string *filename) if (persistent_script && !persistent_script->corrupted) { if (ZCG(accel_directives).validate_timestamps) { zend_file_handle handle; - int ret; zend_stream_init_filename_ex(&handle, filename); ret = validate_timestamp_and_record_ex(persistent_script, &handle) == SUCCESS ? 1 : 0; zend_destroy_file_handle(&handle); - return ret; + } else { + ret = 1; } - - return 1; } } - return 0; + accelerator_shm_read_unlock(); + + return ret; } static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)