zend_file_cache_script_load_ex

Author: iamacarpet

Diff for: ext/opcache/ZendAccelerator.c

@@ -1923,7 +1923,7 @@ static zend_op_array *file_cache_compile_file(zend_file_handle *file_handle, int
 
 	HANDLE_BLOCK_INTERRUPTIONS();
 	SHM_UNPROTECT();
-	persistent_script = zend_file_cache_script_load(file_handle, false);
+	persistent_script = zend_file_cache_script_load(file_handle);
 	SHM_PROTECT();
 	HANDLE_UNBLOCK_INTERRUPTIONS();
 	if (persistent_script) {
@@ -2140,7 +2140,7 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 
 	/* Check the second level cache */
 	if (!persistent_script && ZCG(accel_directives).file_cache) {
-		persistent_script = zend_file_cache_script_load(file_handle, false);
+		persistent_script = zend_file_cache_script_load(file_handle);
 	}
 
 	/* If script was not found or invalidated by validate_timestamps */

Diff for: ext/opcache/zend_accelerator_module.c

@@ -380,7 +380,7 @@ static int filename_is_in_file_cache(zend_string *filename)
 	zend_stream_init_filename_ex(&handle, filename);
 	handle.opened_path = realpath;
 
-	zend_persistent_script *result = zend_file_cache_script_load(&handle, true);
+	zend_persistent_script *result = zend_file_cache_script_load_ex(&handle, true);
 
 	zend_destroy_file_handle(&handle);
 

Diff for: ext/opcache/zend_file_cache.c

@@ -1827,7 +1827,12 @@ static void zend_file_cache_unserialize(zend_persistent_script  *script,
 
 static zend_persistent_script file_cache_validate_success_script;
 
-zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handle, bool validate_only)
+zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handle)
+{
+	return zend_file_cache_script_load_ex(zend_file_handle, false)
+}
+
+zend_persistent_script *zend_file_cache_script_load_ex(zend_file_handle *file_handle, bool validate_only)
 {
 	zend_string *full_path = file_handle->opened_path;
 	int fd;

Diff for: ext/opcache/zend_file_cache.h

@@ -20,7 +20,8 @@
 #define ZEND_FILE_CACHE_H
 
 int zend_file_cache_script_store(zend_persistent_script *script, bool in_shm);
-zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handle, bool validate_only);
+zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handle);
+zend_persistent_script *zend_file_cache_script_load_ex(zend_file_handle *file_handle, bool validate_only);
 void zend_file_cache_invalidate(zend_string *full_path);
 
 #endif /* ZEND_FILE_CACHE_H */