[master] 0c6ef77 Don't optimize out the (completed) bo for esi-children

Poul-Henning Kamp phk at FreeBSD.org
Thu Aug 28 10:24:18 CEST 2014


commit 0c6ef776600557f052ccc9532550c1ccf14bf1ae
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Aug 28 07:41:32 2014 +0000

    Don't optimize out the (completed) bo for esi-children

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index e97d81d..14b45cf 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -169,7 +169,7 @@ cnt_deliver(struct worker *wrk, struct req *req)
 
 	/* Grab a ref to the bo if there is one, and hand it down */
 	bo = HSH_RefBusy(req->objcore);
-	if (bo != NULL && bo->state == BOS_FINISHED)
+	if (bo != NULL && req->esi_level == 0 && bo->state == BOS_FINISHED)
 		VBO_DerefBusyObj(wrk, &bo);
 	V1D_Deliver(req, bo);
 	if (bo != NULL)



More information about the varnish-commit mailing list