Adjust to VDP API Changes from VC#4035

Ref https://github.com/varnishcache/varnish-cache/pull/4035
parent 253cd88a
...@@ -1489,20 +1489,23 @@ re_vfp_fini(struct vfp_ctx *vc, struct vfp_entry *vfe) ...@@ -1489,20 +1489,23 @@ re_vfp_fini(struct vfp_ctx *vc, struct vfp_entry *vfe)
(type *)((char *)__mptr - offsetof(type, member)) ; }) (type *)((char *)__mptr - offsetof(type, member)) ; })
static int v_matchproto_(vdp_init_f) static int v_matchproto_(vdp_init_f)
re_vdp_init(VRT_CTX, struct vdp_ctx *vdx, void **priv, struct objcore *oc) re_vdp_init(VRT_CTX, struct vdp_ctx *vdc, void **priv,
struct objcore *oc, struct req *req,
struct http *hd, intmax_t *cl)
{ {
const struct vmod_re_regex *re; const struct vmod_re_regex *re;
struct vdp_container *vdpc; struct vdp_container *vdpc;
struct re_flt_state *res; struct re_flt_state *res;
struct vdp_entry *vde; struct vdp_entry *vde;
struct vmod_priv *task; struct vmod_priv *task;
struct req *req;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vdx, VDP_CTX_MAGIC); CHECK_OBJ_NOTNULL(vdc, VDP_CTX_MAGIC);
AN(priv);
CHECK_OBJ_ORNULL(oc, OBJCORE_MAGIC); CHECK_OBJ_ORNULL(oc, OBJCORE_MAGIC);
req = vdx->req; CHECK_OBJ_ORNULL(req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); CHECK_OBJ_NOTNULL(hd, HTTP_MAGIC);
AN(cl);
/* /*
* making a mountain out of a molehill because we do not * making a mountain out of a molehill because we do not
...@@ -1531,7 +1534,7 @@ re_vdp_init(VRT_CTX, struct vdp_ctx *vdx, void **priv, struct objcore *oc) ...@@ -1531,7 +1534,7 @@ re_vdp_init(VRT_CTX, struct vdp_ctx *vdx, void **priv, struct objcore *oc)
AZ(*priv); AZ(*priv);
*priv = res; *priv = res;
req->resp_len = -1; *cl = -1;
return (0); return (0);
} }
......
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