Make "now" available in vcl_error too

This, together with the previous couple of commits completely
addresses the code aspects of bug #294.

diff --git a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
index 28e76c4e98b0375343a42f2fd07fe229e0ddf9dc..95c84f8dbc54bee8c6b90ff734782677c3941704 100755 (executable)
--- a/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
+++ b/varnish-cache/lib/libvcl/vcc_gen_obj.tcl
@@ -213,7 +213,7 @@ set spobj {
     # XXX: or delta times in VCL programs, so this shouldn't be needed /phk
     { now
            RO TIME
-           {recv pipe pass hash miss hit fetch deliver discard timeout}
+           {recv pipe pass hash miss hit fetch deliver discard timeout error}
            "const struct sess *"
     }
     { req.backend.healthy      RO BOOL

diff --git a/varnish-cache/lib/libvcl/vcc_obj.c b/varnish-cache/lib/libvcl/vcc_obj.c
index 37f14364ca59f75fcf3ae32d0e5d1e9d25be9e60..31ef1ea013cfb0d90184be0fefdf0e9b3ac1178c 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_obj.c
+++ b/varnish-cache/lib/libvcl/vcc_obj.c
@@ -193,7 +193,7 @@ struct var vcc_vars[] = {
            V_RO,           0,
            VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH
             | VCL_MET_MISS | VCL_MET_HIT | VCL_MET_FETCH | VCL_MET_DELIVER
-            | VCL_MET_DISCARD | VCL_MET_TIMEOUT
+            | VCL_MET_DISCARD | VCL_MET_TIMEOUT | VCL_MET_ERROR
        },
        { "req.backend.healthy", BOOL, 19,
            "VRT_r_req_backend_healthy(sp)",        NULL,