[master] 13cf51e70 Rename (struct req).filter_list to vdp_filter_list

[Nils Goroll]

commit 13cf51e70c00b912ce39110d7eff50ccc01b7bb9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Dec 11 08:10:54 2023 +0100

    Rename (struct req).filter_list to vdp_filter_list
    
    for consistency with (struct busyobj).vfp_filter_list

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index b6af25537..a7fcac6bf 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -533,7 +533,7 @@ struct req {
 
 	/* Deliver pipeline */
 	struct vdp_ctx		*vdc;
-	const char		*filter_list;
+	const char		*vdp_filter_list;
 
 	/* Transaction VSL buffer */
 	struct vsl_log		vsl[1];
diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
index eb1700df1..cfea8fce2 100644
--- a/bin/varnishd/cache/cache_req.c
+++ b/bin/varnishd/cache/cache_req.c
@@ -251,7 +251,7 @@ Req_Rollback(VRT_CTX)
 	if (IS_TOPREQ(req))
 		VCL_TaskEnter(req->top->privs);
 	HTTP_Clone(req->http, req->http0);
-	req->filter_list = NULL;
+	req->vdp_filter_list = NULL;
 	req->vcf = NULL;
 	if (WS_Overflowed(req->ws))
 		req->wrk->stats->ws_client_overflow++;
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index b49f4dadd..bb7a43d4e 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -297,7 +297,7 @@ cnt_vclfail(struct worker *wrk, struct req *req)
 	}
 	req->req_step = R_STP_SYNTH;
 	req->doclose = SC_VCL_FAILURE;
-	req->filter_list = NULL;
+	req->vdp_filter_list = NULL;
 	return (REQ_FSM_MORE);
 }
 
@@ -327,7 +327,7 @@ cnt_synth(struct worker *wrk, struct req *req)
 
 	Resp_Setup_Synth(req);
 
-	req->filter_list = NULL;
+	req->vdp_filter_list = NULL;
 	synth_body = VSB_new_auto();
 	AN(synth_body);
 
@@ -461,10 +461,10 @@ cnt_transmit(struct worker *wrk, struct req *req)
 	}
 
 	VDP_Init(req->vdc, req->wrk, req->vsl, req);
-	if (req->filter_list == NULL)
-		req->filter_list = resp_Get_Filter_List(req);
-	if (req->filter_list == NULL ||
-	    VCL_StackVDP(req, req->vcl, req->filter_list)) {
+	if (req->vdp_filter_list == NULL)
+		req->vdp_filter_list = resp_Get_Filter_List(req);
+	if (req->vdp_filter_list == NULL ||
+	    VCL_StackVDP(req, req->vcl, req->vdp_filter_list)) {
 		VSLb(req->vsl, SLT_Error, "Failure to push processors");
 		req->doclose = SC_OVERLOAD;
 	} else {
@@ -513,7 +513,7 @@ cnt_transmit(struct worker *wrk, struct req *req)
 	(void)HSH_DerefObjCore(wrk, &req->objcore, HSH_RUSH_POLICY);
 	http_Teardown(req->resp);
 
-	req->filter_list = NULL;
+	req->vdp_filter_list = NULL;
 	req->res_mode = 0;
 	return (REQ_FSM_DONE);
 }
diff --git a/bin/varnishd/cache/cache_vrt_filter.c b/bin/varnishd/cache/cache_vrt_filter.c
index bcd7ed1b3..e0ca18321 100644
--- a/bin/varnishd/cache/cache_vrt_filter.c
+++ b/bin/varnishd/cache/cache_vrt_filter.c
@@ -448,4 +448,4 @@ resp_Get_Filter_List(struct req *req)
 	}
 
 FILTER_VAR(beresp, bo, VBF_Get_Filter_List, vfp_filter_list)
-FILTER_VAR(resp, req, resp_Get_Filter_List, filter_list)
+FILTER_VAR(resp, req, resp_Get_Filter_List, vdp_filter_list)
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 8810fcc51..c1282c149 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -1002,7 +1002,7 @@ VRT_r_resp_is_streaming(VRT_CTX)
 static inline int
 resp_filter_fixed(VRT_CTX, const char *s)
 {
-	if (ctx->req->filter_list == NULL)
+	if (ctx->req->vdp_filter_list == NULL)
 		return (0);
 	VRT_fail(ctx, "resp.filters are already fixed, %s is undefined", s);
 	return (1);
diff --git a/include/vrt.h b/include/vrt.h
index fe292e3ce..2a478b372 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -58,6 +58,7 @@
  * binary/load-time compatible, increment MAJOR version
  *
  * NEXT (2024-03-15)
+ *	[cache.h] (struct req).filter_list renamed to vdp_filter_list
  * 18.1 (2023-12-05)
  *	vbf_objiterate() implementation changed #4013
  * 18.0 (2023-09-15)