[master] b042383 Test resp.do_esi

Fri Feb 23 21:44:08 UTC 2018

commit b042383fcf81b6bac2071b9fec5e3750ff4338ae
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Feb 23 21:42:30 2018 +0000

    Test resp.do_esi

diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index b394668..e8b47de 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -2,6 +2,7 @@ varnishtest "ESI requests turned off"
 
 server s1 {
 	rxreq
+	expect req.url == /
 	txresp -body {
 		<html>
 		Before include
@@ -42,7 +43,46 @@ client c1 {
 	rxresp
 	expect resp.bodylen == 76
 	expect resp.status == 200
+} -run
+
+varnish v1 -vsl_catchup
+
+varnish v1 -expect esi_errors == 0
+
+server s1 {
+	rxreq
+	expect req.url == /top2
+	txresp -body {
+		<html>
+		Before include
+		<esi:include src="/body"/>
+		After include
+	}
+} -start
+
+varnish v1 -syntax 4.1 -vcl+backend {
+	sub vcl_deliver {
+		set resp.http.was = resp.do_esi;
+		if (req.url == "/top2") {
+			set resp.do_esi = false;
+		}
+	}
+	sub vcl_backend_response {
+		set beresp.do_esi = true;
+	}
 }
 
-client c1 -run
+client c1 {
+	txreq -url /top2
+	rxresp
+	expect resp.bodylen == 73
+	expect resp.status == 200
+	expect resp.http.was == true
+	txreq -url "/esi"
+	rxresp
+	expect resp.bodylen == 76
+	expect resp.status == 200
+	expect resp.http.was == true
+} -run
+
 varnish v1 -expect esi_errors == 0
