Merge branch 'opcache/opcache_is_script_cached_file' of https://github.com/iamacarpet/php-src into opcache/opcache_is_script_cached_file

iamacarpet · iamacarpet · commit e9605e7aa45c · 2025-07-11T21:06:03.000Z
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -368,27 +368,21 @@ static int filename_is_in_cache(zend_string *filename)
 
 static int filename_is_in_file_cache(zend_string *filename)
 {
-	zend_string *realpath;
-
-	realpath = zend_resolve_path(filename);
-
+	zend_string *realpath = zend_resolve_path(filename);
 	if (!realpath) {
 		return 0;
 	}
 
 	zend_file_handle handle;
-
 	zend_stream_init_filename_ex(&handle, filename);
 	handle.opened_path = realpath;
 
 	zend_persistent_script *result = zend_file_cache_script_load_ex(&handle, true);
-
 	zend_destroy_file_handle(&handle);
 
 	return result != NULL;
 }
 
-
 static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)
 {
 	if (ZEND_NUM_ARGS() == 1) {

Original file line number	Diff line number	Diff line change
`@@ -368,27 +368,21 @@ static int filename_is_in_cache(zend_string *filename)`
`368`	`368`
`369`	`369`	`static int filename_is_in_file_cache(zend_string *filename)`
`370`	`370`	`{`
`371`		`- zend_string *realpath;`
`372`		`-`
`373`		`- realpath = zend_resolve_path(filename);`
`374`		`-`
	`371`	`+ zend_string *realpath = zend_resolve_path(filename);`
`375`	`372`	`if (!realpath) {`
`376`	`373`	`return 0;`
`377`	`374`	`}`
`378`	`375`
`379`	`376`	`zend_file_handle handle;`
`380`		`-`
`381`	`377`	`zend_stream_init_filename_ex(&handle, filename);`
`382`	`378`	`handle.opened_path = realpath;`
`383`	`379`
`384`	`380`	`zend_persistent_script *result = zend_file_cache_script_load_ex(&handle, true);`
`385`		`-`
`386`	`381`	`zend_destroy_file_handle(&handle);`
`387`	`382`
`388`	`383`	`return result != NULL;`
`389`	`384`	`}`
`390`	`385`
`391`		`-`
`392`	`386`	`static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)`
`393`	`387`	`{`
`394`	`388`	`if (ZEND_NUM_ARGS() == 1) {`