Commit:    e66c8681c7e559c0893ec84ff16a4de3ea6d5f32
Author:    Dmitry Stogov <dmi...@zend.com>         Sun, 17 Mar 2013 11:56:04 
+0400
Parents:   0b8b6a727ddd31ff14e4af919c77a3f1b5e2b3f0
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=e66c8681c7e559c0893ec84ff16a4de3ea6d5f32

Log:
Made opcache_get_status() return statistics during O+ restart

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 11dd7d3..e6c6939 100644
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -474,14 +474,14 @@ static ZEND_FUNCTION(opcache_get_status)
        }
 #endif
        
-       if (!ZCG(enabled) || !accel_startup_ok || !ZCSG(accelerator_enabled)) {
+       if (!accel_startup_ok) {
                RETURN_FALSE;
        }
 
        array_init(return_value);
 
        /* Trivia */
-       add_assoc_bool(return_value, "opcache_enabled", 1 /*ZCG(enabled) && 
accel_startup_ok && ZCSG(accelerator_enabled)*/);
+       add_assoc_bool(return_value, "opcache_enabled", ZCG(enabled) && 
ZCSG(accelerator_enabled));
        add_assoc_bool(return_value, "cache_full", ZSMMG(memory_exhausted));
 
        /* Memory usage statistics */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to