vrt_var: req.ttl and req.grace are NAN when unset

Author: AlveElde

bin/varnishd/cache/cache_expire.c

@@ -73,7 +73,7 @@ EXP_Ttl(const struct req *req, const struct objcore *oc)
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 
 	r = oc->ttl;
-	if (req != NULL && req->d_ttl >= 0. && req->d_ttl < r)
+	if (req != NULL && !isnan(req->d_ttl) && req->d_ttl < r)
 		r = req->d_ttl;
 	return (oc->t_origin + r);
 }
@@ -91,7 +91,7 @@ EXP_Ttl_grace(const struct req *req, const struct objcore *oc)
 	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
 
 	g = oc->grace;
-	if (req != NULL && req->d_grace >= 0. && req->d_grace < g)
+	if (req != NULL && !isnan(req->d_grace) && req->d_grace < g)
 		g = req->d_grace;
 	return (EXP_Ttl(req, oc) + g);
 }

bin/varnishd/cache/cache_req_fsm.c

@@ -891,8 +891,8 @@ cnt_recv_prep(struct req *req, const char *ci)
 		VRT_Assign_Backend(&req->director_hint,
 		    VCL_DefaultDirector(req->vcl));
 
-		req->d_ttl = -1;
-		req->d_grace = -1;
+		req->d_ttl = NAN;
+		req->d_grace = NAN;
 		req->disable_esi = 0;
 		req->hash_always_miss = 0;
 		req->hash_ignore_busy = 0;

bin/varnishd/cache/cache_vrt_var.c

@@ -569,16 +569,17 @@ VRT_u_req_##nm(VRT_CTX)							\
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);				\
 	CHECK_OBJ_NOTNULL(ctx->req, REQ_MAGIC);				\
 	ctx->req->elem = val;						\
+	ctx->req->elem = val;						\
 }
 
 REQ_VAR_R(backend_hint, director_hint, VCL_BACKEND)
 
 REQ_VAR_L(ttl, d_ttl, VCL_DURATION, if (!(arg>0.0)) arg = 0;)
 REQ_VAR_R(ttl, d_ttl, VCL_DURATION)
-REQ_VAR_U(ttl, d_ttl, -1)
+REQ_VAR_U(ttl, d_ttl, NAN)
 REQ_VAR_L(grace, d_grace, VCL_DURATION, if (!(arg>0.0)) arg = 0;)
 REQ_VAR_R(grace, d_grace, VCL_DURATION)
-REQ_VAR_U(grace, d_grace, -1)
+REQ_VAR_U(grace, d_grace, NAN)
 
 VCL_VOID
 VRT_l_req_backend_hint(VRT_CTX, VCL_BACKEND be)