Adjust to Varnish-Cache 7.5

parent fc10e6ee
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_COPYRIGHT([Copyright (c) 2019 UPLEX - Nils Goroll Systemoptimierung]) AC_COPYRIGHT([Copyright 2019 - 2024 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvdfp-pipe],[trunk],[varnish-support@uplex.de],[vdfp-pipe]) AC_INIT([libvdfp-pipe],[trunk],[varnish-support@uplex.de],[vdfp-pipe])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vdfp_pipe.vcc) AC_CONFIG_SRCDIR(src/vdfp_pipe.vcc)
...@@ -53,7 +53,7 @@ AM_CONDITIONAL(HAVE_GENHTML, [test -n "$GENHTML"]) ...@@ -53,7 +53,7 @@ AM_CONDITIONAL(HAVE_GENHTML, [test -n "$GENHTML"])
m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst])) m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
VARNISH_PREREQ([7.4],[trunk]) VARNISH_PREREQ([7.5],[trunk])
VARNISH_VMODS([pipe]) VARNISH_VMODS([pipe])
VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)" VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
......
...@@ -174,9 +174,8 @@ mk_dup(int oldfd, int newfd) ...@@ -174,9 +174,8 @@ mk_dup(int oldfd, int newfd)
} }
static int v_matchproto_(vdp_init_f) static int v_matchproto_(vdp_init_f)
vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv, struct objcore *objcore) vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv)
{ {
struct req *req;
struct vdp_state *state; struct vdp_state *state;
struct vdp_entry *vdpe; struct vdp_entry *vdpe;
struct vdp_map map_entry, *map; struct vdp_map map_entry, *map;
...@@ -187,19 +186,19 @@ vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv, struct objcore *objcore) ...@@ -187,19 +186,19 @@ vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv, struct objcore *objcore)
struct setenv_head *setenv_head; struct setenv_head *setenv_head;
char **argv; char **argv;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vc, VDP_CTX_MAGIC); CHECK_OBJ_NOTNULL(vc, VDP_CTX_MAGIC);
req = vc->req; CHECK_OBJ_NOTNULL(vc->hp, HTTP_MAGIC);
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); AN(vc->clen);
AN(req->vcl);
AN(priv); AN(priv);
AZ(*priv); AZ(*priv);
CHECK_OBJ_ORNULL(objcore, OBJCORE_MAGIC);
vdpe = VTAILQ_LAST(&vc->vdp, vdp_entry_s); vdpe = VTAILQ_LAST(&vc->vdp, vdp_entry_s);
CHECK_OBJ_NOTNULL(vdpe, VDP_ENTRY_MAGIC); CHECK_OBJ_NOTNULL(vdpe, VDP_ENTRY_MAGIC);
AN(vdpe->vdp); AN(vdpe->vdp);
map_entry.vdp = vdpe->vdp; map_entry.vdp = vdpe->vdp;
map_entry.vcl = req->vcl; map_entry.vcl = ctx->vcl;
map = VRBT_FIND(vdp_tree, &tree_h, &map_entry); map = VRBT_FIND(vdp_tree, &tree_h, &map_entry);
CHECK_OBJ_NOTNULL(map, PIPE_VDP_MAP_MAGIC); CHECK_OBJ_NOTNULL(map, PIPE_VDP_MAP_MAGIC);
CHECK_OBJ_NOTNULL(map->obj, PIPE_VDP_MAGIC); CHECK_OBJ_NOTNULL(map->obj, PIPE_VDP_MAGIC);
...@@ -309,7 +308,7 @@ vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv, struct objcore *objcore) ...@@ -309,7 +308,7 @@ vdp_init(VRT_CTX, struct vdp_ctx *vc, void **priv, struct objcore *objcore)
state->fds[STDIN_FILENO].fd = in[1]; state->fds[STDIN_FILENO].fd = in[1];
state->fds[STDOUT_FILENO].fd = out[0]; state->fds[STDOUT_FILENO].fd = out[0];
state->fds[STDERR_FILENO].fd = err[0]; state->fds[STDERR_FILENO].fd = err[0];
http_Unset(req->resp, H_Content_Length); http_Unset(vc->hp, H_Content_Length);
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