fix when file_cache_read_only

iamacarpet · iamacarpet · commit 824e63805703 · 2024-11-28T16:08:28.000Z
diff --git a/ext/opcache/tests/gt16979.phpt b/ext/opcache/tests/gt16979.phpt
@@ -7,7 +7,6 @@ opcache.jit=disable
 opcache.jit_buffer_size=0
 opcache.file_cache={TMP}
 opcache.file_cache_only=1
-opcache.log_verbosity_level=4
 --EXTENSIONS--
 opcache
 --FILE--
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -1026,8 +1026,9 @@ ZEND_FUNCTION(opcache_is_script_cached)
 		RETURN_FALSE;
 	}
 
-	if (!ZCG(accelerator_enabled)) {
-		RETURN_FALSE;
+	if (!ZCG(accelerator_enabled) &&
+		!(file_cache && ZCG(accel_directives).file_cache_read_only)) {
+			RETURN_FALSE;
 	}
 
 	if (file_cache) {

Original file line number	Diff line number	Diff line change
`@@ -1026,8 +1026,9 @@ ZEND_FUNCTION(opcache_is_script_cached)`
`1026`	`1026`	`RETURN_FALSE;`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`		`- if (!ZCG(accelerator_enabled)) {`
`1030`		`- RETURN_FALSE;`
	`1029`	`+ if (!ZCG(accelerator_enabled) &&`
	`1030`	`+ !(file_cache && ZCG(accel_directives).file_cache_read_only)) {`
	`1031`	`+ RETURN_FALSE;`
`1031`	`1032`	`}`
`1032`	`1033`
`1033`	`1034`	`if (file_cache) {`