Browse Source

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


git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.1@256 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.1
Xuefer 15 years ago
parent
commit
2dd6bb7eef
  1. 6
      NEWS
  2. 2
      admin/xcache.php
  3. 2
      coverager.c
  4. 4
      xcache.c

6
NEWS

@ -1,6 +1,8 @@
1.1 2006-10-11
========
cacher:
* fix xcache_get issue on ttl 0 data
* coverager: avoid crash when php failed to compile file
* gc expired items, new ini
* xcache.ttl
* xcache.gc_interval
@ -38,6 +40,10 @@ Others:
ChangeLog
========
* 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
* merged from trunk: 159,161-162,167-180,182,184,186-187,194
* [194] PHP_5_2: new element in zend_brk_cont_element
* [186] [187] fix build on some rare arch

2
admin/xcache.php

@ -70,6 +70,8 @@ function age($time)
return $ret . ' ' . $name[$i];
}
}
return '0 s';
}
function switcher($name, $options)

2
coverager.c

@ -350,7 +350,7 @@ static zend_op_array *xc_compile_file_for_coverage(zend_file_handle *h, int type
zend_op_array *op_array;
op_array = origin_compile_file(h, type TSRMLS_CC);
if (XG(coveragedumper) && XG(coverages)) {
if (XG(coveragedumper) && XG(coverages) && op_array) {
xc_coverager_init_compile_result(op_array TSRMLS_CC);
}
return op_array;

4
xcache.c

@ -1583,7 +1583,7 @@ PHP_FUNCTION(xcache_get)
ENTER_LOCK(xce.cache) {
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 */
break;
@ -2093,7 +2093,7 @@ PHP_INI_BEGIN()
#ifdef HAVE_XCACHE_OPTIMIZER
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)
STD_PHP_INI_BOOLEAN("xcache.coveragedumper" , "0", PHP_INI_ALL, OnUpdateBool, coveragedumper, zend_xcache_globals, xcache_globals)

Loading…
Cancel
Save