[master] 45c767cce Don't reset the workspace on pointless VDP_Push(), things might still have been happening on the workspace (See: VRG)
Poul-Henning Kamp
phk at FreeBSD.org
Mon Nov 19 22:15:16 UTC 2018
commit 45c767cce08971793c631312f307d67b4418aa02
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Nov 19 21:26:48 2018 +0000
Don't reset the workspace on pointless VDP_Push(), things might
still have been happening on the workspace (See: VRG)
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index c549f3be3..8c4d3b538 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -78,7 +78,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
{
struct vdp_entry *vdpe;
struct vdp_ctx *vdc;
- uintptr_t sn;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
vdc = req->vdc;
@@ -92,7 +91,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
if (DO_DEBUG(DBG_PROCESSORS))
VSLb(req->vsl, SLT_Debug, "VDP_push(%s)", vdp->name);
- sn = WS_Snapshot(req->ws);
vdpe = WS_Alloc(req->ws, sizeof *vdpe);
if (vdpe == NULL) {
AZ(vdc->retval);
@@ -111,7 +109,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
if (vdc->retval > 0) {
VTAILQ_REMOVE(&vdc->vdp, vdpe, list);
vdc->nxt = VTAILQ_FIRST(&vdc->vdp);
- WS_Reset(req->ws, sn);
vdc->retval = 0;
}
return (vdc->retval);
More information about the varnish-commit
mailing list