r3963 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-03-20 10:43:36 +0100 (Fri, 20 Mar 2009)
New Revision: 3963

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
Log:
Only make object uncacheable if both obj.ttl and obj.grace is zero.



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-03-19 14:55:55 UTC (rev 3962)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-03-20 09:43:36 UTC (rev 3963)
@@ -494,7 +494,7 @@
 	sp->obj->cacheable = sp->wrk->cacheable;
 	sp->obj->ttl = sp->wrk->ttl;
 	sp->obj->grace = sp->wrk->grace;
-	if (sp->obj->ttl == 0.)
+	if (sp->obj->ttl == 0. && sp->obj->grace == 0.)		
 		sp->obj->cacheable = 0;
 	sp->obj->age = sp->wrk->age;
 	sp->obj->entered = sp->wrk->entered;