opcache: file_cache_read_only code review update (#16484)

Author: iamacarpet

ext/opcache/ZendAccelerator.c

@@ -3305,35 +3305,40 @@ static zend_result accel_post_startup(void)
 	}
 
 	/* opcache.file_cache_read_only should only be enabled when all script files are read-only */
+	int file_cache_access_mode = 0;
+
 	if (ZCG(accel_directives).file_cache_read_only) {
 		if (!ZCG(accel_directives).file_cache) {
 			accel_startup_ok = false;
 			zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache_read_only is set without a proper setting of opcache.file_cache");
 			return SUCCESS;
 		}
-		if (ZCG(accel_directives).revalidate_freq != 0) {
-			accel_startup_ok = false;
-			zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache_read_only cannot be enabled when opcache.revalidate_freq is not 0.");
-			return SUCCESS;
-		}
-		if (ZCG(accel_directives).validate_timestamps) {
-			accel_startup_ok = false;
-			zend_accel_error_noreturn(ACCEL_LOG_FATAL, "opcache.file_cache_read_only cannot be enabled when opcache.validate_timestamps is enabled.");
-			return SUCCESS;
-		}
+
+		/* opcache.file_cache is read only, so ensure the directory is readable */
+#ifndef ZEND_WIN32
+		file_cache_access_mode = R_OK | X_OK;
+#else
+		file_cache_access_mode = 04; // Read access
+#endif
 	} else {
 		/* opcache.file_cache isn't read only, so ensure the directory is writable */
-		if ( ZCG(accel_directives).file_cache &&
 #ifndef ZEND_WIN32
-				access(ZCG(accel_directives).file_cache, R_OK | W_OK | X_OK) != 0
+		file_cache_access_mode = R_OK | W_OK | X_OK;
 #else
-				_access(ZCG(accel_directives).file_cache, 06) != 0
+		file_cache_access_mode = 06; // Read and write access
+#endif
+	}
+
+	if ( ZCG(accel_directives).file_cache &&
+#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, writable 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

@@ -170,12 +170,7 @@ static ZEND_INI_MH(OnUpdateFileCache)
 
 		    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(ZSTR_VAL(new_value), R_OK | X_OK) != 0) {
-#else
-				_access(ZSTR_VAL(new_value), 04) != 0) {
-#endif
+			    !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;
 			}
@@ -311,10 +306,10 @@ 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_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)
+	STD_PHP_INI_ENTRY("opcache.file_cache"                    , NULL  , PHP_INI_SYSTEM, OnUpdateFileCache, 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)
 #if ENABLE_FILE_CACHE_FALLBACK
 	STD_PHP_INI_BOOLEAN("opcache.file_cache_fallback"           , "1"   , PHP_INI_SYSTEM, OnUpdateBool,	   accel_directives.file_cache_fallback,           zend_accel_globals, accel_globals)
 #endif