r3993 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-23 13:59:52 +0100 (Mon, 23 Mar 2009)
New Revision: 3993

Modified:
   branches/2.0/varnish-cache/bin/varnishd/rfc2616.c
Log:
Merge r3963: Only make object uncacheable if both obj.ttl and obj.grace is zero.



Modified: branches/2.0/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/rfc2616.c	2009-03-23 12:50:04 UTC (rev 3992)
+++ branches/2.0/varnish-cache/bin/varnishd/rfc2616.c	2009-03-23 12:59:52 UTC (rev 3993)
@@ -197,7 +197,7 @@
 	}
 
 	sp->obj->ttl = RFC2616_Ttl(sp, hp, sp->obj);
-	if (sp->obj->ttl == 0)
+	if (sp->obj->ttl == 0. && sp->obj->grace == 0.)
 		sp->obj->cacheable = 0;
 
 	return (body);