[master] 71c18e5 Use the Grace-defaulting function we already have.

Poul-Henning Kamp phk at varnish-cache.org
Fri Jan 28 22:46:56 CET 2011


commit 71c18e53daf8673a8f678bb041c3e895e650d7ef
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Jan 28 21:46:40 2011 +0000

    Use the Grace-defaulting function we already have.

diff --git a/bin/varnishd/cache_vrt_var.c b/bin/varnishd/cache_vrt_var.c
index 44f7ec3..a111e0b 100644
--- a/bin/varnishd/cache_vrt_var.c
+++ b/bin/varnishd/cache_vrt_var.c
@@ -450,9 +450,7 @@ VRT_r_##which##_grace(struct sess *sp)				\
 {								\
 								\
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);			\
-	if (isnan(fld))						\
-		 return ((double)params->default_grace);	\
-	return(fld);						\
+	return(HSH_Grace(fld));					\
 }
 
 VRT_DO_GRACE(req, sp->grace, )



More information about the varnish-commit mailing list