Commit 13d6057a authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Make foo.grace and foo.keep return 0. as lowest value.

foo.ttl still returns -1. to close gap due to integer second timestamps.
parent 6fe073ae
......@@ -73,11 +73,11 @@ EXP_Clr(struct exp *e)
e->keep = -1;
}
#define EXP_ACCESS(fld, extra) \
#define EXP_ACCESS(fld, low_val, extra) \
double \
EXP_Get_##fld(const struct exp *e) \
{ \
return (e->fld > 0. ? e->fld : -1.); \
return (e->fld > 0. ? e->fld : low_val); \
} \
\
void \
......@@ -91,9 +91,9 @@ EXP_Clr(struct exp *e)
} \
} \
EXP_ACCESS(ttl, (e->grace = e->keep = -1.))
EXP_ACCESS(grace,)
EXP_ACCESS(keep,)
EXP_ACCESS(ttl, -1., (e->grace = e->keep = -1.))
EXP_ACCESS(grace, 0., )
EXP_ACCESS(keep, 0.,)
/*--------------------------------------------------------------------
* Calculate when an object is out of ttl or grace, possibly constrained
......
......@@ -21,5 +21,5 @@ varnish v1 -vcl+backend {
client c1 {
txreq
rxresp
expect resp.msg == "-1.000"
expect resp.msg == "0.000"
} -run
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment