diff options
Diffstat (limited to 'ext/opcache/zend_accelerator_module.c')
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 11301a75d2..5b43a55202 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -438,11 +438,11 @@ void zend_accel_info(ZEND_MODULE_INFO_FUNC_ARGS) { php_info_print_table_start(); - if (ZCG(enabled) && accel_startup_ok && + if ( #ifdef HAVE_OPCACHE_FILE_CACHE - ((ZCG(counted) || ZCSG(accelerator_enabled)) || file_cache_only) + (ZCG(accelerator_enabled) || file_cache_only) #else - (ZCG(counted) || ZCSG(accelerator_enabled)) + (ZCG(accelerator_enabled)) #endif ) { php_info_print_table_row(2, "Opcode Caching", "Up and Running"); @@ -546,7 +546,7 @@ static int accelerator_get_scripts(zval *return_value) struct timeval exec_time; struct timeval fetch_time; - if (!ZCG(enabled) || !accel_startup_ok || !ZCSG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) { + if (!ZCG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) { return 0; } @@ -608,7 +608,7 @@ static ZEND_FUNCTION(opcache_get_status) array_init(return_value); /* Trivia */ - add_assoc_bool(return_value, "opcache_enabled", ZCG(enabled) && (ZCG(counted) || ZCSG(accelerator_enabled))); + add_assoc_bool(return_value, "opcache_enabled", ZCG(accelerator_enabled)); #ifdef HAVE_OPCACHE_FILE_CACHE if (ZCG(accel_directives).file_cache) { @@ -805,7 +805,7 @@ static ZEND_FUNCTION(opcache_compile_file) return; } - if (!ZCG(enabled) || !accel_startup_ok || !ZCSG(accelerator_enabled)) { + if (!ZCG(accelerator_enabled)) { zend_error(E_NOTICE, ACCELERATOR_PRODUCT_NAME " seems to be disabled, can't compile file"); RETURN_FALSE; } @@ -844,7 +844,7 @@ static ZEND_FUNCTION(opcache_is_script_cached) RETURN_FALSE; } - if (!ZCG(enabled) || !accel_startup_ok || !ZCSG(accelerator_enabled)) { + if (!ZCG(accelerator_enabled)) { RETURN_FALSE; } |