Index: branches/1.1/NEWS
===================================================================
--- branches/1.1/NEWS	(revision 255)
+++ branches/1.1/NEWS	(revision 256)
@@ -2,4 +2,6 @@
 ========
 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
@@ -39,4 +41,8 @@
 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
Index: branches/1.1/admin/xcache.php
===================================================================
--- branches/1.1/admin/xcache.php	(revision 255)
+++ branches/1.1/admin/xcache.php	(revision 256)
@@ -71,4 +71,6 @@
 		}
 	}
+
+	return '0 s';
 }
 
Index: branches/1.1/coverager.c
===================================================================
--- branches/1.1/coverager.c	(revision 255)
+++ branches/1.1/coverager.c	(revision 256)
@@ -351,5 +351,5 @@
 
 	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);
 	}
Index: branches/1.1/xcache.c
===================================================================
--- branches/1.1/xcache.c	(revision 255)
+++ branches/1.1/xcache.c	(revision 256)
@@ -1584,5 +1584,5 @@
 		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,5 +2094,5 @@
 	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)