diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-11-16 23:15:14 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-11-16 23:15:14 +0300 |
| commit | 935d922114a69cd70b2ebf83719ff2b235d56c90 (patch) | |
| tree | 67645dfe7641c46fce6943292992691235e5ab1b | |
| parent | 8202b970777b84d57c590b78f9b6572ef0e0c205 (diff) | |
| download | php-git-935d922114a69cd70b2ebf83719ff2b235d56c90.tar.gz | |
"opcache.validate_root" is useless on Windows
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index a711de74be..a13c15c55d 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -231,7 +231,9 @@ typedef struct _zend_accel_directives { zend_bool inherited_hack; zend_bool enable_cli; zend_bool validate_permission; +#ifndef ZEND_WIN32 zend_bool validate_root; +#endif unsigned long revalidate_freq; unsigned long file_update_protection; char *error_log; diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 0faa91500f..5705ed79e9 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -256,7 +256,9 @@ ZEND_INI_BEGIN() STD_PHP_INI_BOOLEAN("opcache.use_cwd" , "1", PHP_INI_SYSTEM, OnUpdateBool, accel_directives.use_cwd , zend_accel_globals, accel_globals) STD_PHP_INI_BOOLEAN("opcache.validate_timestamps", "1", PHP_INI_ALL , OnUpdateBool, accel_directives.validate_timestamps, zend_accel_globals, accel_globals) STD_PHP_INI_BOOLEAN("opcache.validate_permission", "0", PHP_INI_SYSTEM, OnUpdateBool, accel_directives.validate_permission, zend_accel_globals, accel_globals) +#ifndef ZEND_WIN32 STD_PHP_INI_BOOLEAN("opcache.validate_root" , "0", PHP_INI_SYSTEM, OnUpdateBool, accel_directives.validate_root , zend_accel_globals, accel_globals) +#endif STD_PHP_INI_BOOLEAN("opcache.inherited_hack" , "1", PHP_INI_SYSTEM, OnUpdateBool, accel_directives.inherited_hack , zend_accel_globals, accel_globals) STD_PHP_INI_BOOLEAN("opcache.dups_fix" , "0", PHP_INI_ALL , OnUpdateBool, accel_directives.ignore_dups , zend_accel_globals, accel_globals) STD_PHP_INI_BOOLEAN("opcache.revalidate_path" , "0", PHP_INI_ALL , OnUpdateBool, accel_directives.revalidate_path , zend_accel_globals, accel_globals) @@ -666,7 +668,9 @@ static ZEND_FUNCTION(opcache_get_configuration) add_assoc_bool(directives, "opcache.use_cwd", ZCG(accel_directives).use_cwd); add_assoc_bool(directives, "opcache.validate_timestamps", ZCG(accel_directives).validate_timestamps); add_assoc_bool(directives, "opcache.validate_permission", ZCG(accel_directives).validate_permission); +#ifndef ZEND_WIN32 add_assoc_bool(directives, "opcache.validate_root", ZCG(accel_directives).validate_root); +#endif add_assoc_bool(directives, "opcache.inherited_hack", ZCG(accel_directives).inherited_hack); add_assoc_bool(directives, "opcache.dups_fix", ZCG(accel_directives).ignore_dups); add_assoc_bool(directives, "opcache.revalidate_path", ZCG(accel_directives).revalidate_path); |