[master] 4d006b802 Also fix this test for Jails

[Poul-Henning Kamp]

commit 4d006b802f8d34455d8d289aac983dcd247c35a8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat May 23 13:33:39 2020 +0000

    Also fix this test for Jails

diff --git a/bin/varnishtest/tests/h00007.vtc b/bin/varnishtest/tests/h00007.vtc
index 2e42472ad..237c45cae 100644
--- a/bin/varnishtest/tests/h00007.vtc
+++ b/bin/varnishtest/tests/h00007.vtc
@@ -11,13 +11,29 @@ server s1 {
     txresp -body "s1 >>> Hello world!"
 } -start
 
-varnish v1 -proto "PROXY" -vcl+backend {
+varnish v1 -proto "PROXY" -vcl+backend {} -start
+
+haproxy h1 -D -conf {
+    defaults
+	mode   tcp
+	timeout connect         5s
+	timeout server          30s
+	timeout client          30s
+
+    listen ssloff
+	bind "fd@${fe1}"
+	server v1 ${v1_addr}:${v1_port} send-proxy-v2
+} -start
+
+varnish v1 -vcl+backend {
 	import std;
 
 	acl localhost {
 		"localhost";
 		"127.0.0.1";
 		"::1";
+		"${s1_addr}";		# Jail IPv4 address
+		"${h1_fe1_addr}";	# Jail IPv6 address
 	}
 
 	sub vcl_deliver {
@@ -29,19 +45,7 @@ varnish v1 -proto "PROXY" -vcl+backend {
 		set resp.http.notstdip =
 		    std.ip("" + client.ip, resolve = false) !~ localhost;
 	}
-} -start
-
-haproxy h1 -D -conf {
-    defaults
-	mode   tcp
-	timeout connect         5s
-	timeout server          30s
-	timeout client          30s
-
-    listen ssloff
-	bind "fd@${fe1}"
-	server v1 ${v1_addr}:${v1_port} send-proxy-v2
-} -start
+} 
 
 client c1 -connect ${h1_fe1_sock} {
     txreq -url "/"