fix for file_cache_only

iamacarpet · iamacarpet · commit e8d7427eb9bb · 2024-12-03T15:14:08.000Z
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -1037,7 +1037,12 @@ ZEND_FUNCTION(opcache_is_script_cached_in_file_cache)
 		RETURN_FALSE;
 	}
 
-	if (!ZCG(accelerator_enabled) || !ZCG(accel_directives).file_cache) {
+	// account for accelerator_enabled = false when file_cache_only = true
+	if (!(ZCG(accelerator_enabled) || ZCG(accel_directives).file_cache_only)) {
+		RETURN_FALSE;
+	}
+	
+	if (!ZCG(accel_directives).file_cache) {
 		RETURN_FALSE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,12 @@ ZEND_FUNCTION(opcache_is_script_cached_in_file_cache)`
`1037`	`1037`	`RETURN_FALSE;`
`1038`	`1038`	`}`
`1039`	`1039`
`1040`		`- if (!ZCG(accelerator_enabled) \|\| !ZCG(accel_directives).file_cache) {`
	`1040`	`+ // account for accelerator_enabled = false when file_cache_only = true`
	`1041`	`+ if (!(ZCG(accelerator_enabled) \|\| ZCG(accel_directives).file_cache_only)) {`
	`1042`	`+ RETURN_FALSE;`
	`1043`	`+ }`
	`1044`	`+`
	`1045`	`+ if (!ZCG(accel_directives).file_cache) {`
`1041`	`1046`	`RETURN_FALSE;`
`1042`	`1047`	`}`
`1043`	`1048`