[master] f4b367e Ensure VFP is correctly set when unbusy'ing
Federico G. Schwindt
fgsch at lodoss.net
Thu Feb 9 15:26:05 CET 2017
commit f4b367e15301ce04abd8ad13376b45964595abd1
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Thu Feb 9 13:54:20 2017 +0000
Ensure VFP is correctly set when unbusy'ing
Fixes #2104.
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 0f6f88e..43d87ca 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -726,9 +726,6 @@ cnt_recv(struct worker *wrk, struct req *req)
http_CollectHdr(req->http, H_Cache_Control);
- VFP_Setup(req->vfc);
- req->vfc->http = req->http;
- req->vfc->wrk = wrk;
if (req->transport->req_body != NULL) {
req->transport->req_body(req);
@@ -899,6 +896,10 @@ CNT_Request(struct worker *wrk, struct req *req)
req->wrk = wrk;
wrk->vsl = req->vsl;
+ VFP_Setup(req->vfc);
+ req->vfc->http = req->http;
+ req->vfc->wrk = wrk;
+
for (nxt = REQ_FSM_MORE; nxt == REQ_FSM_MORE; ) {
/*
* This is a good place to be paranoid about the various
More information about the varnish-commit
mailing list