[master] be77dbc Don't skip ESI processing for included gzip objects

[Poul-Henning Kamp]

commit be77dbcae20678e86e312e2660d4768055e42fcd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 27 07:52:16 2014 +0000

    Don't skip ESI processing for included gzip objects

diff --git a/bin/varnishd/http1/cache_http1_deliver.c b/bin/varnishd/http1/cache_http1_deliver.c
index 26fae72..746f129 100644
--- a/bin/varnishd/http1/cache_http1_deliver.c
+++ b/bin/varnishd/http1/cache_http1_deliver.c
@@ -343,7 +343,8 @@ V1D_Deliver(struct req *req, struct busyobj *bo)
 		/* This was a HEAD or conditional request */
 	} else if (req->esi_level > 0) {
 		if (req->gzip_resp &&
-		    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED)) {
+		    ObjCheckFlag(req->wrk, req->objcore, OF_GZIPED) &&
+		    !(req->res_mode & RES_ESI)) {
 			if (bo != NULL)
 				VBO_waitstate(bo, BOS_FINISHED);
 			ESI_DeliverChild(req);