Changeset 256 for branches/1.1


Ignore:
Timestamp:
2006-10-17T20:47:00+02:00 (9 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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/NEWS

    r255 r256  
    22========
    33cacher:
     4 * fix xcache_get issue on ttl 0 data
     5 * coverager: avoid crash when php failed to compile file
    46 * gc expired items, new ini
    57   * xcache.ttl
     
    3941ChangeLog
    4042========
     43 * merged [254] fix xcache.var_ttl displaying in info, fix xcache_get for ttl-unlimited
     44 * merged [250] admin: fix switcher class on active
     45 * merged [249] return 0 s instead of empty for deltatime
     46 * merged [201] coverager: avoid crash when upstream failed to compile file
    4147 * merged from trunk: 159,161-162,167-180,182,184,186-187,194
    4248   * [194] PHP_5_2: new element in zend_brk_cont_element
  • branches/1.1/admin/xcache.php

    r147 r256  
    7171        }
    7272    }
     73
     74    return '0 s';
    7375}
    7476
  • branches/1.1/coverager.c

    r255 r256  
    351351
    352352    op_array = origin_compile_file(h, type TSRMLS_CC);
    353     if (XG(coveragedumper) && XG(coverages)) {
     353    if (XG(coveragedumper) && XG(coverages) && op_array) {
    354354        xc_coverager_init_compile_result(op_array TSRMLS_CC);
    355355    }
  • branches/1.1/xcache.c

    r246 r256  
    15841584        stored_xce = xc_entry_find_dmz(&xce TSRMLS_CC);
    15851585        if (stored_xce) {
    1586             if (XG(request_time) <= stored_xce->ctime + stored_xce->ttl) {
     1586            if (!VAR_ENTRY_EXPIRED(stored_xce)) {
    15871587                xc_processor_restore_zval(return_value, stored_xce->data.var->value TSRMLS_CC);
    15881588                /* return */
     
    20942094    STD_PHP_INI_BOOLEAN("xcache.optimizer",              "0", PHP_INI_ALL,    OnUpdateBool,        optimizer,         zend_xcache_globals, xcache_globals)
    20952095#endif
    2096     STD_PHP_INI_BOOLEAN("xcache.var_ttl",                "0", PHP_INI_ALL,    OnUpdateLong,        var_ttl,   zend_xcache_globals, xcache_globals)
     2096    STD_PHP_INI_ENTRY  ("xcache.var_ttl",                "0", PHP_INI_ALL,    OnUpdateLong,        var_ttl,           zend_xcache_globals, xcache_globals)
    20972097#ifdef HAVE_XCACHE_COVERAGER
    20982098    PHP_INI_ENTRY1     ("xcache.coveragedump_directory", "/tmp/pcov/", PHP_INI_SYSTEM, xc_OnUpdateString,   &xc_coveragedump_dir)
Note: See TracChangeset for help on using the changeset viewer.