[master] 74f7e66 We should always have a "now" from either the req or bo

Poul-Henning Kamp phk at FreeBSD.org
Wed Feb 25 11:38:29 CET 2015


commit 74f7e663b4334622b1f0733c5c810c71b69afa93
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 25 10:38:03 2015 +0000

    We should always have a "now" from either the req or bo

diff --git a/bin/varnishd/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index d74e9b0..f096b60 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -461,8 +461,7 @@ vcl_call_method(struct worker *wrk, struct req *req, struct busyobj *bo,
 		ctx.bo = bo;
 		ctx.now = bo->t_prev;
 	}
-	if (ctx.now == 0)
-		ctx.now = VTIM_real();
+	assert(ctx.now != 0);
 	ctx.ws = ws;
 	ctx.vsl = vsl;
 	ctx.method = method;



More information about the varnish-commit mailing list