[master] 5522ddd91 document that `now` remains constant during vcl subs and test for it

[Nils Goroll]

commit 5522ddd91c1e53f3d03d64ae2dcf03a7072ac2c9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Oct 25 14:45:17 2018 +0200

    document that `now` remains constant during vcl subs and test for it

diff --git a/bin/varnishtest/tests/b00030.vtc b/bin/varnishtest/tests/b00030.vtc
index 5962b40d2..626324755 100644
--- a/bin/varnishtest/tests/b00030.vtc
+++ b/bin/varnishtest/tests/b00030.vtc
@@ -1,7 +1,8 @@
-varnishtest "Test formatting of timestamps"
+varnishtest "Test timestamps"
 
-# We can't test the value of x-timestamp, but this should fail
+# We can't test the value of a timestamp, but this should fail
 # if we can't set the header at all.
+# We also test that `now` remains unchanged during a vcl sub
 
 server s1 {
 	rxreq
@@ -9,16 +10,65 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
+	import vtc;
+
+	sub recv_sub {
+		set req.http.recv_sub = now;
+	}
 	sub vcl_recv {
-		return (synth(200));
+		set req.http.recv = now;
+		vtc.sleep(1s);
+		call recv_sub;
+		if (req.http.recv != req.http.recv_sub) {
+			return (fail);
+		}
 	}
 	sub vcl_synth {
-		set resp.http.x-timestamp = now;
+		set resp.http.synth = now;
+	}
+
+	sub vcl_deliver {
+		set resp.http.deliver = now;
+		if (req.http.recv == req.http.deliver) {
+			return (fail);
+		}
+
+		vtc.sleep(1s);
+		return (synth(200));
 	}
+
+	sub bf_sub {
+		set bereq.http.bf_sub = now;
+	}
+	sub vcl_backend_fetch {
+		set bereq.http.bf = now;
+		vtc.sleep(1s);
+		call bf_sub;
+		if (bereq.http.bf != bereq.http.bf_sub) {
+			return (fail);
+		}
+	}
+	sub br_sub {
+		set beresp.http.br_sub = now;
+	}
+	sub vcl_backend_response {
+		set beresp.http.br = now;
+		vtc.sleep(1s);
+		call br_sub;
+		if (beresp.http.br != beresp.http.br_sub) {
+			return (fail);
+		}
+		if (bereq.http.bf == beresp.http.br) {
+			return (fail);
+		}
+	}
+
+
 } -start
 
 client c1 {
 	txreq
 	rxresp
-	expect resp.http.x-timestamp ~ "..., .. ... .... ..:..:.. GMT"
+	expect resp.status == 200
+	expect resp.http.synth ~ "^..., .. ... .... ..:..:.. GMT"
 } -run
diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index 7aa434da6..67bf1dd12 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -105,8 +105,11 @@ VCL has time. A duration can be added to a time to make another time.
 In string context they return a formatted string in RFC1123 format,
 e.g. ``Sun, 06 Nov 1994 08:49:37 GMT``.
 
-The keyword ``now`` returns a time representing the current time in seconds
-since the Epoch.
+The keyword ``now`` returns a notion of the current time, which is
+kept cosistent during vcl subroutine invocations, so during the
+execution of a vcl subroutine callback (``vcl_* {}``), including all
+user-defined subroutines beging called, ``now`` always returns the
+same value.
 
 Durations
 ~~~~~~~~~