diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-29 15:49:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-29 15:49:52 +0800 |
| commit | cb1db49d0a071a9ae89c930ee7efa4a68b742972 (patch) | |
| tree | b3f234b89cbb35d420a2164ccac38d17e81e8a63 /ext/opcache/zend_accelerator_module.c | |
| parent | 8a6f90543f07599b3bd629cf78b39c3b68c31814 (diff) | |
| parent | 3f07a256f75a55eaf7e7bfed681f8dfb4b901e55 (diff) | |
| download | php-git-cb1db49d0a071a9ae89c930ee7efa4a68b742972.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed info while setting opcache.file_cache_only
Drop extra line
Add CVE for #71105 (PHP 7.0.1)
Diffstat (limited to 'ext/opcache/zend_accelerator_module.c')
| -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 bb89020b21..4c07abb115 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -430,12 +430,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"); |