Changeset 626 for branches/1.3/xcache.c

Timestamp:

2009-07-05T11:15:55+02:00 (4 years ago)

Author:

moo

Message:

merged r562-572 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• xcache.c (modified) (3 diffs)

branches/1.3/xcache.c

@@ -226 +226 @@
     for (p = xce->cache->entries[xce->hvalue]; p; p = p->next) {
         if (xc_entry_equal_dmz(xce, p)) {
-            if (p->type == XC_TYPE_VAR || /* PHP */ p->data.php->mtime == xce->data.php->mtime) {
+            if (p->type == XC_TYPE_VAR || /* PHP */ p->data.php->mtime == xce->data.php->mtime && p->data.php->sourcesize == xce->data.php->sourcesize) {
                 p->hits ++;
                 p->atime = XG(request_time);
@@ -2803 +2803 @@
     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) {
@@ -2808 +2816 @@
         }
         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) {