Merge r3965: Fix for #445: including zero length esi objects with chu…

…nked encoding.

git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@3995 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_response.c

@@ -152,7 +152,9 @@ RES_WriteObj(struct sess *sp)
 	}
 
 	if (sp->wantbody) {
-		if (sp->esis > 0 && sp->http->protover >= 1.1) {
+		if (sp->esis > 0 &&
+		    sp->http->protover >= 1.1 &&
+		    sp->obj->len > 0) {
 			sprintf(lenbuf, "%x\r\n", sp->obj->len);
 			(void)WRW_Write(sp->wrk, lenbuf, -1);
 		}
@@ -181,7 +183,9 @@ RES_WriteObj(struct sess *sp)
 			(void)WRW_Write(sp->wrk, st->ptr, st->len);
 		}
 		assert(u == sp->obj->len);
-		if (sp->esis > 0 && sp->http->protover >= 1.1)
+		if (sp->esis > 0 &&
+		    sp->http->protover >= 1.1 &&
+		    sp->obj->len > 0)
 			(void)WRW_Write(sp->wrk, "\r\n", -1);
 	}
 	if (WRW_FlushRelease(sp->wrk))

bin/varnishtest/tests/r00445

@@ -0,0 +1,24 @@
+# $Id$
+
+test "zero length ESI include segmens with chunked encoding"
+
+server s1 {
+	rxreq
+	expect req.url == "/"
+	txresp -body {<foo><esi:include src="/bar"><bar>}
+	rxreq
+	expect req.url == "/bar"
+	txresp 
+} -start
+
+varnish v1 -vcl+backend {
+	sub vcl_fetch {
+		esi;
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.bodylen == 10
+} -run