Use default_grace consistently or it will all be in vain.

Submitted by:	sky
Fixes:	ticket 253



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@2737 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache.h

@@ -462,6 +462,7 @@ struct object *HSH_Lookup(struct sess *sp);
 void HSH_Unbusy(struct sess *sp);
 void HSH_Ref(struct object *o);
 void HSH_Deref(struct object *o);
+double HSH_Grace(double g);
 void HSH_Init(void);
 
 /* cache_http.c */

bin/varnishd/cache_expire.c

@@ -147,7 +147,7 @@ update_object_when(const struct object *o)
 		oe->timer_when = o->prefetch;
 		oe->timer_what = tmr_prefetch;
 	} else {
-		oe->timer_when = o->ttl + o->grace;
+		oe->timer_when = o->ttl + HSH_Grace(o->grace);
 		oe->timer_what = tmr_ttl;
 	}
 }

bin/varnishd/cache_hash.c

@@ -67,7 +67,7 @@
 
 static struct hash_slinger      *hash;
 
-static double
+double
 HSH_Grace(double g)
 {
 	if (isnan(g))