[master] 5b212a2c5 Postpone VDP_Init() until we need it. Zero in the meantime.

Poul-Henning Kamp phk at FreeBSD.org
Mon Oct 26 20:07:09 UTC 2020


commit 5b212a2c5966698e243402d230d18c7bd0496c01
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 26 19:29:21 2020 +0000

    Postpone VDP_Init() until we need it.  Zero in the meantime.

diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index 7f94d8348..2de283512 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -131,7 +131,7 @@ Req_New(const struct worker *wrk, struct sess *sp)
 	p = (void*)PRNDUP(p + sizeof(*req->htc));
 
 	req->vdc = (void*)p;
-	VDP_Init(req->vdc);
+	memset(req->vdc, 0, sizeof *req->vdc);
 	p = (void*)PRNDUP(p + sizeof(*req->vdc));
 
 	req->htc = (void*)p;
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index b84591bb8..9ad804dea 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -425,6 +425,7 @@ cnt_transmit(struct worker *wrk, struct req *req)
 		sendbody = 1;
 	}
 
+	VDP_Init(req->vdc);
 	if (req->filter_list == NULL)
 		req->filter_list = resp_Get_Filter_List(req);
 	if (req->filter_list == NULL ||


More information about the varnish-commit mailing list