Skip to content

V
varnish-cache
Commit 41c1eeb2 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp Committed by Dridi Boukelmoune
Browse files
Options

Don't reset the workspace on pointless VDP_Push(), things might 

still have been happening on the workspace (See: VRG)
parent ce2c7091
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
bin/varnishd/cache/cache_deliver_proc.c
View file @ 41c1eeb2
...@@ -78,7 +78,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv) ...@@ -78,7 +78,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
{ {
struct vdp_entry *vdpe; struct vdp_entry *vdpe;
struct vdp_ctx *vdc; struct vdp_ctx *vdc;
uintptr_t sn;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
vdc = req->vdc; vdc = req->vdc;
...@@ -92,7 +91,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv) ...@@ -92,7 +91,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
if (DO_DEBUG(DBG_PROCESSORS)) if (DO_DEBUG(DBG_PROCESSORS))
VSLb(req->vsl, SLT_Debug, "VDP_push(%s)", vdp->name); VSLb(req->vsl, SLT_Debug, "VDP_push(%s)", vdp->name);
sn = WS_Snapshot(req->ws);
vdpe = WS_Alloc(req->ws, sizeof *vdpe); vdpe = WS_Alloc(req->ws, sizeof *vdpe);
if (vdpe == NULL) { if (vdpe == NULL) {
AZ(vdc->retval); AZ(vdc->retval);
...@@ -111,7 +109,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv) ...@@ -111,7 +109,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
if (vdc->retval > 0) { if (vdc->retval > 0) {
VTAILQ_REMOVE(&vdc->vdp, vdpe, list); VTAILQ_REMOVE(&vdc->vdp, vdpe, list);
vdc->nxt = VTAILQ_FIRST(&vdc->vdp); vdc->nxt = VTAILQ_FIRST(&vdc->vdp);
WS_Reset(req->ws, sn);
vdc->retval = 0; vdc->retval = 0;
} }
return (vdc->retval); return (vdc->retval);
......
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