Changeset 570 for trunk/xcache.c

Timestamp:

2008-08-20T16:38:45+02:00 (5 years ago)

Author:

moo

Message:

disable XCache for cli correctly

File:

• trunk/xcache.c (modified) (2 diffs)

trunk/xcache.c

@@ -3053 +3053 @@
     REGISTER_INI_ENTRIES();
 
+    xc_config_long(&xc_php_size,       "xcache.size",        "0");
+    xc_config_hash(&xc_php_hcache,     "xcache.count",       "1");
+    xc_config_hash(&xc_php_hentry,     "xcache.slots",      "8K");
+
+    xc_config_long(&xc_var_size,       "xcache.var_size",    "0");
+    xc_config_hash(&xc_var_hcache,     "xcache.var_count",   "1");
+    xc_config_hash(&xc_var_hentry,     "xcache.var_slots",  "8K");
+
     if (strcmp(sapi_module.name, "cli") == 0) {
         if ((env = getenv("XCACHE_TEST")) != NULL) {
@@ -3058 +3066 @@
         }
         if (!xc_test) {
-            /* disable cache for cli except for test */
+            /* disable cache for cli except for testing */
             xc_php_size = xc_var_size = 0;
         }
     }
-
-    xc_config_long(&xc_php_size,       "xcache.size",        "0");
-    xc_config_hash(&xc_php_hcache,     "xcache.count",       "1");
-    xc_config_hash(&xc_php_hentry,     "xcache.slots",      "8K");
-
-    xc_config_long(&xc_var_size,       "xcache.var_size",    "0");
-    xc_config_hash(&xc_var_hcache,     "xcache.var_count",   "1");
-    xc_config_hash(&xc_var_hentry,     "xcache.var_slots",  "8K");
 
     if (xc_php_size <= 0) {