Rename (struct req).filter_list to vdp_filter_list

for consistency with (struct busyobj).vfp_filter_list
parent c1aa3c20
......@@ -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];
......
......@@ -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++;
......
......@@ -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);
}
......
......@@ -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)
......@@ -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);
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment