[master] 5b2af36 Set a OA_flag to indicate ESI processing.

[Poul-Henning Kamp]

commit 5b2af362207af5890789a2f4951f5dd1e832026a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 11 10:37:43 2014 +0000

    Set a OA_flag to indicate ESI processing.

diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index f9cf52c..cede109 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -590,6 +590,9 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 	assert(V1L_IsReleased(wrk));
 
 
+	if (bo->do_esi)
+		ObjSetFlag(bo->wrk, bo->fetch_objcore, OF_ESIPROC, 1);
+
 	if (bo->do_gzip || (bo->is_gzip && !bo->do_gunzip))
 		ObjSetFlag(bo->wrk, bo->fetch_objcore, OF_GZIPED, 1);
 
@@ -604,10 +607,6 @@ vbf_stp_fetch(struct worker *wrk, struct busyobj *bo)
 	if (bo->htc->body_status != BS_NONE)
 		AZ(VDI_GetBody(bo->director_resp, bo->wrk, bo));
 
-	/*
-	 * Ready to fetch the body
-	 */
-
 	assert(bo->refcount >= 1);
 
 	assert (bo->state == BOS_REQ_DONE);
diff --git a/include/tbl/obj_attr.h b/include/tbl/obj_attr.h
index b121793..d0f281e 100644
--- a/include/tbl/obj_attr.h
+++ b/include/tbl/obj_attr.h
@@ -46,6 +46,7 @@ OBJ_ATTR(LASTMODIFIED,	lastmodified)
 OBJ_FLAG(GZIPED,	gziped,		(1<<1))
 OBJ_FLAG(CHGGZIP,	chggzip,	(1<<2))
 OBJ_FLAG(IMSCAND,	imscand,	(1<<3))
+OBJ_FLAG(ESIPROC,	esiproc,	(1<<4))
 #endif
 
 /*lint -restore */