expire: Force a cache MISS when req.ttl = 0s

This commit changes the undefined behavior of setting req.ttl = 0s.
Setting req.ttl = 0s would previously cause req.ttl to have no effect,
but this breaks with setting req.grace = 0s, which does have an effect.

The new behavior of setting req.ttl = 0s is similar to setting
req.hash_always_miss = true, the main difference is that req.ttl allows
for request coalescing. Useful for short-lived non-private objects.

This aligns the behavior of setting req.ttl = 0s with req.grace = 0s.

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 && req->d_ttl >= 0. && req->d_ttl < r)
 		r = req->d_ttl;
 	return (oc->t_origin + r);
 }

bin/varnishtest/tests/b00083.vtc

@@ -0,0 +1,92 @@
+varnishtest "req.ttl = 0s forces cache MISS with request coalescing"
+
+barrier b1 cond 3 -cyclic
+
+server s1 {
+	rxreq
+	txresp -nolen -hdr "Content-Length: 3" -hdr "version: 1"
+	barrier b1 sync
+	send "foo"
+
+	rxreq
+	txresp -nolen -hdr "Content-Length: 3" -hdr "version: 2"
+	barrier b1 sync
+	send "bar"
+} -start
+
+varnish v1 -vcl+backend {
+	import std;
+
+	sub vcl_recv {
+		if (req.http.ttl) {
+			set req.ttl = std.duration(req.http.ttl, 0s);
+		}
+	}
+} -start
+
+# c1 and c2 send a request and sync on the barrier only after having received
+# headers. This ensures that the two requests are coalesced.
+
+client c1 {
+	txreq -hdr "ttl: 0s"
+	rxresphdrs
+	expect resp.status == 200
+	expect resp.http.version == "1"
+	barrier b1 sync
+	rxrespbody
+	expect resp.body == "foo"
+} -start
+
+client c2 {
+	txreq -hdr "ttl: 0s"
+	rxresphdrs
+	expect resp.status == 200
+	expect resp.http.version == "1"
+	barrier b1 sync
+	rxrespbody
+	expect resp.body == "foo"
+} -start
+
+client c1 -wait
+client c2 -wait
+
+# c3 checks that a positive or unset req.ttl gets the cached object.
+
+client c3 {
+	txreq -hdr "ttl: 10s"
+	rxresp
+	expect resp.status == 200
+	expect resp.http.version == "1"
+	expect resp.body == "foo"
+
+	txreq
+	rxresp
+	expect resp.status == 200
+	expect resp.http.version == "1"
+	expect resp.body == "foo"
+} -run
+
+# c4 and c5 force a cache MISS, where the two requests are again coalesced.
+
+client c4 {
+	txreq -hdr "ttl: 0s"
+	rxresphdrs
+	expect resp.status == 200
+	expect resp.http.version == "2"
+	barrier b1 sync
+	rxrespbody
+	expect resp.body == "bar"
+} -start
+
+client c5 {
+	txreq -hdr "ttl: 0s"
+	rxresphdrs
+	expect resp.status == 200
+	expect resp.http.version == "2"
+	barrier b1 sync
+	rxrespbody
+	expect resp.body == "bar"
+} -start
+
+client c4 -wait
+client c5 -wait