Show
Ignore:
Timestamp:
10/17/2006 06:47:00 PM (2 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:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.1

    • Property svnmerge-integrated changed from /trunk:1-157,159,161-162,167-180,182,184,186-187,194 to /trunk:1-157,159,161-162,167-180,182,184,186-187,194,201,211,218,237-247,249,251-254

  • 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    }