Changeset 256 for branches/1.1/xcache.c

Timestamp:

2006-10-17T20:47:00+02:00 (7 years ago)

Author:

moo

Message:

trunk->1.1

• merged [254] fix xcache.var_ttl displaying in info, fix xcache_get for ttl-unlimited
• merged [250] admin: fix switcher class on active
• merged [249] return 0 s instead of empty for deltatime
• merged [201] coverager: avoid crash when upstream failed to compile file

Location:

branches/1.1

Files:

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

branches/1.1/xcache.c

@@ -1584 +1584 @@
         stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
         if (stored_xce) {
-            if (XG(request_time) <= stored_xce->ctime + stored_xce->ttl) {
+            if (!VAR_ENTRY_EXPIRED(stored_xce)) {
                 xc_processor_restore_zval(return_value, stored_xce->data.var->value TSRMLS_CC);
                 /* return */
@@ -2094 +2094 @@
     STD_PHP_INI_BOOLEAN("xcache.optimizer",              "0", PHP_INI_ALL,    OnUpdateBool,        optimizer,         zend_xcache_globals, xcache_globals)
 #endif
-    STD_PHP_INI_BOOLEAN("xcache.var_ttl",                "0", PHP_INI_ALL,    OnUpdateLong,        var_ttl,   zend_xcache_globals, xcache_globals)
+    STD_PHP_INI_ENTRY  ("xcache.var_ttl",                "0", PHP_INI_ALL,    OnUpdateLong,        var_ttl,           zend_xcache_globals, xcache_globals)
 #ifdef HAVE_XCACHE_COVERAGER
     PHP_INI_ENTRY1     ("xcache.coveragedump_directory", "/tmp/pcov/", PHP_INI_SYSTEM, xc_OnUpdateString,   &xc_coveragedump_dir)