com php-src: Fixed info while setting opcache.file_cache_ only: ext/opcache/zend_accelerator_module.c
| From: | Xinchen Hui | Date: | Tue, 29 Dec 2015 07:49:10 +0000 |
| Subject: | com php-src: Fixed info while setting opcache.file_cache_ only: ext/opcache/zend_accelerator_module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90475@lists.php.net to get a copy of this message | ||
Commit: 3f07a256f75a55eaf7e7bfed681f8dfb4b901e55
Author: Xinchen Hui <laruence@gmail.com> Tue, 29 Dec 2015 15:49:10 +0800
Parents: c5f9d0b808c34af711d7d7fb253d3d0347784e2c
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f07a256f75a55eaf7e7bfed681f8dfb4b901e55
Log:
Fixed info while setting opcache.file_cache_only
Changed paths:
M ext/opcache/zend_accelerator_module.c
Diff:
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index f65e270..4c86f41 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");