opcache: file_cache_read_only code review update 2 (#16484)

Author: iamacarpet

ext/opcache/ZendAccelerator.c

@@ -3329,16 +3329,20 @@ static zend_result accel_post_startup(void)
 #endif
 	}
 
-	if ( ZCG(accel_directives).file_cache &&
+	if ( ZCG(accel_directives).file_cache ){
+		if (!IS_ABSOLUTE_PATH(ZSTR_VAL(new_value), ZSTR_LEN(new_value)) ||
+			zend_stat(ZSTR_VAL(new_value), &buf) != 0 ||
+			!S_ISDIR(buf.st_mode) ||
 #ifndef ZEND_WIN32
 			access(ZCG(accel_directives).file_cache, file_cache_access_mode) != 0
 #else
 			_access(ZCG(accel_directives).file_cache, file_cache_access_mode) != 0
 #endif
-		) {
-		accel_startup_ok = false;
-		zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache must be a full path of an accessible directory");
-		return SUCCESS;
+			)) {
+			accel_startup_ok = false;
+			zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache must be a full path of an accessible directory");
+			return SUCCESS;
+		}
 	}
 
 #if ENABLE_FILE_CACHE_FALLBACK

ext/opcache/zend_accelerator_module.c

@@ -160,26 +160,6 @@ static ZEND_INI_MH(OnEnable)
 	}
 }
 
-static ZEND_INI_MH(OnUpdateFileCache)
-{
-	if (new_value) {
-		if (!ZSTR_LEN(new_value)) {
-			new_value = NULL;
-		} else {
-			zend_stat_t buf = {0};
-
-		    if (!IS_ABSOLUTE_PATH(ZSTR_VAL(new_value), ZSTR_LEN(new_value)) ||
-			    zend_stat(ZSTR_VAL(new_value), &buf) != 0 ||
-			    !S_ISDIR(buf.st_mode)) {
-				zend_accel_error(ACCEL_LOG_WARNING, "opcache.file_cache must be a full path of accessible directory.\n");
-				new_value = NULL;
-			}
-		}
-	}
-	OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
-	return SUCCESS;
-}
-
 #ifdef HAVE_JIT
 static ZEND_INI_MH(OnUpdateJit)
 {
@@ -306,7 +286,7 @@ ZEND_INI_BEGIN()
 	STD_PHP_INI_ENTRY("opcache.mmap_base", NULL, PHP_INI_SYSTEM,	OnUpdateString,	                             accel_directives.mmap_base,                 zend_accel_globals, accel_globals)
 #endif
 
-	STD_PHP_INI_ENTRY("opcache.file_cache"                    , NULL  , PHP_INI_SYSTEM, OnUpdateFileCache, accel_directives.file_cache,                    zend_accel_globals, accel_globals)
+	STD_PHP_INI_ENTRY("opcache.file_cache"                      , NULL  , PHP_INI_SYSTEM, OnUpdateString,  accel_directives.file_cache,                    zend_accel_globals, accel_globals)
 	STD_PHP_INI_BOOLEAN("opcache.file_cache_read_only"          , "0"   , PHP_INI_SYSTEM, OnUpdateBool,    accel_directives.file_cache_read_only,          zend_accel_globals, accel_globals)
 	STD_PHP_INI_BOOLEAN("opcache.file_cache_only"               , "0"   , PHP_INI_SYSTEM, OnUpdateBool,	   accel_directives.file_cache_only,               zend_accel_globals, accel_globals)
 	STD_PHP_INI_BOOLEAN("opcache.file_cache_consistency_checks" , "1"   , PHP_INI_SYSTEM, OnUpdateBool,	   accel_directives.file_cache_consistency_checks, zend_accel_globals, accel_globals)