[master] 4981c41 Push the output gzip buffer before we process an included object, to maintain proper ordering.

[Poul-Henning Kamp]

commit 4981c41f27e681a21e77538ecd27185a4ac8d87d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 15 10:27:10 2011 +0000

    Push the output gzip buffer before we process an included object, to
    maintain proper ordering.

diff --git a/bin/varnishd/cache_esi_deliver.c b/bin/varnishd/cache_esi_deliver.c
index a8050de..62c1bf4 100644
--- a/bin/varnishd/cache_esi_deliver.c
+++ b/bin/varnishd/cache_esi_deliver.c
@@ -364,6 +364,11 @@ ESI_Deliver(struct sess *sp)
 			q++;
 			r = (void*)strchr((const char*)q, '\0');
 			AN(r);
+			if (obufl > 0) {
+				ved_sendchunk(sp, NULL, 0,
+				    obuf, obufl);
+				obufl = 0;
+			}
 			Debug("INCL [%s][%s] BEGIN\n", q, p);
 			ved_include(sp, (const char*)q, (const char*)p);
 			Debug("INCL [%s][%s] END\n", q, p);