diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-29 15:49:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-29 15:49:10 +0800 |
| commit | 3f07a256f75a55eaf7e7bfed681f8dfb4b901e55 (patch) | |
| tree | 58eb20af938f40624a7c6e55f80f8b65ec0ea14e | |
| parent | c5f9d0b808c34af711d7d7fb253d3d0347784e2c (diff) | |
| download | php-git-3f07a256f75a55eaf7e7bfed681f8dfb4b901e55.tar.gz | |
Fixed info while setting opcache.file_cache_only
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index f65e270000..4c86f41412 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -429,12 +429,18 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS) { php_info_print_table_start(); - if (ZCG(enabled) && accel_startup_ok && (ZCG(counted) || ZCSG(accelerator_enabled))) { + if (ZCG(enabled) && accel_startup_ok && +#ifdef HAVE_OPCACHE_FILE_CACHE + ((ZCG(counted) || ZCSG(accelerator_enabled)) || ZCG(accel_directives).file_cache_only) +#else + (ZCG(counted) || ZCSG(accelerator_enabled)) +#endif + ) { php_info_print_table_row(2, "Opcode Caching", "Up and Running"); } else { php_info_print_table_row(2, "Opcode Caching", "Disabled"); } - if (ZCG(enabled) && accel_startup_ok && ZCSG(accelerator_enabled) && ZCG(accel_directives).optimization_level) { + if (ZCG(enabled) && accel_startup_ok && ZCG(accel_directives).optimization_level) { php_info_print_table_row(2, "Optimization", "Enabled"); } else { php_info_print_table_row(2, "Optimization", "Disabled"); |