[master] 776c838 Add a missing VDP flush operation after ESI:includes.

Poul-Henning Kamp phk at FreeBSD.org
Tue Feb 2 01:23:24 CET 2016


commit 776c8386b063b53ef40317a3d8a98ef495ff709f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 2 00:22:04 2016 +0000

    Add a missing VDP flush operation after ESI:includes.
    
    In incredibly seldom circumstances this bug would cause ESI:include
    data to be bad.
    
    Fixes:	#1852

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 703109b..efa6fb2 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -775,6 +775,7 @@ VED_Deliver(struct req *req, struct boc *boc, int wantbody)
 		else
 			VDP_push(req, ved_vdp_bytes, ecx->preq, 1);
 		(void)VDP_DeliverObj(req);
+		(void)VDP_bytes(req, VDP_FLUSH, NULL, 0);
 	}
 	VDP_close(req);
 }



More information about the varnish-commit mailing list