[4.1] 0519806 Avoid connection attempts to ${bad_ip}:80

Lasse Karstensen lkarsten at varnish-software.com
Thu Jan 14 15:15:07 CET 2016


commit 05198064870546dfbdd5984a18d05404489c6474
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Dec 1 16:37:01 2015 +0100

    Avoid connection attempts to ${bad_ip}:80
    
    There is a Squid server listening in today's office...

diff --git a/bin/varnishtest/tests/b00015.vtc b/bin/varnishtest/tests/b00015.vtc
index e26b16d..ec1990f 100644
--- a/bin/varnishtest/tests/b00015.vtc
+++ b/bin/varnishtest/tests/b00015.vtc
@@ -4,7 +4,8 @@ varnishtest "Check synthetic error page caching"
 
 varnish v1 -vcl {
 	backend foo {
-		.host = "${bad_ip}"; .port = "9080";
+		.host = "${bad_ip}";
+		.port = "9080";
 	}
 } -start
 
diff --git a/bin/varnishtest/tests/b00017.vtc b/bin/varnishtest/tests/b00017.vtc
index 81776bb..d0088aa 100644
--- a/bin/varnishtest/tests/b00017.vtc
+++ b/bin/varnishtest/tests/b00017.vtc
@@ -2,7 +2,8 @@ varnishtest "Check that we do not close one error"
 
 varnish v1 -vcl {
 	backend foo {
-		.host = "${bad_ip}"; .port = "9080";
+		.host = "${bad_ip}";
+		.port = "9080";
 	}
 	sub vcl_recv {
 		return (synth(888));
diff --git a/bin/varnishtest/tests/c00028.vtc b/bin/varnishtest/tests/c00028.vtc
index 10caf43..7ecfb7c 100644
--- a/bin/varnishtest/tests/c00028.vtc
+++ b/bin/varnishtest/tests/c00028.vtc
@@ -2,7 +2,8 @@ varnishtest "Test that we can't recurse restarts forever"
 
 varnish v1 -vcl {
 	backend bad {
-		.host = "${bad_ip}"; .port = "9090";
+		.host = "${bad_ip}";
+		.port = "9090";
 	}
 
 	sub vcl_backend_fetch {
diff --git a/bin/varnishtest/tests/c00061.vtc b/bin/varnishtest/tests/c00061.vtc
index ef2ae76..b22f259 100644
--- a/bin/varnishtest/tests/c00061.vtc
+++ b/bin/varnishtest/tests/c00061.vtc
@@ -2,7 +2,7 @@ varnishtest "retry in vcl_backend_error"
 
 varnish v1 -vcl {
 
-	backend b1 { .host = "${bad_ip}"; }
+	backend b1 { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_backend_error {
 		return (retry);
diff --git a/bin/varnishtest/tests/c00063.vtc b/bin/varnishtest/tests/c00063.vtc
index 0da903e..9da60a0 100644
--- a/bin/varnishtest/tests/c00063.vtc
+++ b/bin/varnishtest/tests/c00063.vtc
@@ -2,7 +2,7 @@ varnishtest "cache backend synth object"
 
 varnish v1 -vcl {
 
-	backend b { .host = "${bad_ip}"; }
+	backend b { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_backend_error {
 		set beresp.ttl = 1s;
diff --git a/bin/varnishtest/tests/c00066.vtc b/bin/varnishtest/tests/c00066.vtc
index ec88da6..14d4126 100644
--- a/bin/varnishtest/tests/c00066.vtc
+++ b/bin/varnishtest/tests/c00066.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	backend bad { .host = "${bad_ip}"; }
+	backend bad { .host = "${bad_ip}"; .port = "9080"; }
 	sub vcl_recv {
 		if (req.url == "/synth") {
 			return (synth(200, "Synth test"));
diff --git a/bin/varnishtest/tests/d00007.vtc b/bin/varnishtest/tests/d00007.vtc
index 298fbf7..26112e6 100644
--- a/bin/varnishtest/tests/d00007.vtc
+++ b/bin/varnishtest/tests/d00007.vtc
@@ -8,7 +8,7 @@ server s1 {
 varnish v1 -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/d00008.vtc b/bin/varnishtest/tests/d00008.vtc
index a30edd8..79096b9 100644
--- a/bin/varnishtest/tests/d00008.vtc
+++ b/bin/varnishtest/tests/d00008.vtc
@@ -15,7 +15,7 @@ server s2 {
 varnish v1 -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/d00009.vtc b/bin/varnishtest/tests/d00009.vtc
index c888d20..46d05c4 100644
--- a/bin/varnishtest/tests/d00009.vtc
+++ b/bin/varnishtest/tests/d00009.vtc
@@ -18,7 +18,7 @@ server s2 {
 varnish v1 -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/d00010.vtc b/bin/varnishtest/tests/d00010.vtc
index 1db0ea7..145112a 100644
--- a/bin/varnishtest/tests/d00010.vtc
+++ b/bin/varnishtest/tests/d00010.vtc
@@ -18,7 +18,7 @@ server s2 {
 varnish v1 -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/d00011.vtc b/bin/varnishtest/tests/d00011.vtc
index 01d45a1..639161e 100644
--- a/bin/varnishtest/tests/d00011.vtc
+++ b/bin/varnishtest/tests/d00011.vtc
@@ -12,7 +12,7 @@ varnish v1 -vcl {
 	import ${vmod_std};
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/d00012.vtc b/bin/varnishtest/tests/d00012.vtc
index 74aaa8d..41d23e4 100644
--- a/bin/varnishtest/tests/d00012.vtc
+++ b/bin/varnishtest/tests/d00012.vtc
@@ -12,7 +12,7 @@ server s1 {
 varnish v1 -arg "-p thread_pools=1" -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
@@ -41,7 +41,7 @@ server s2 {
 varnish v1 -vcl {
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s2 = debug.dyn("${s2_addr}", "${s2_port}");
diff --git a/bin/varnishtest/tests/d00013.vtc b/bin/varnishtest/tests/d00013.vtc
index 25ab33f..6762f41 100644
--- a/bin/varnishtest/tests/d00013.vtc
+++ b/bin/varnishtest/tests/d00013.vtc
@@ -12,7 +12,7 @@ varnish v1 -vcl {
 	import ${vmod_std};
 	import ${vmod_debug};
 
-	backend dummy { .host = "${bad_ip}"; }
+	backend dummy { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new s1 = debug.dyn("${s1_addr}", "${s1_port}");
diff --git a/bin/varnishtest/tests/r01002.vtc b/bin/varnishtest/tests/r01002.vtc
index 2697d77..6e9e3fd 100644
--- a/bin/varnishtest/tests/r01002.vtc
+++ b/bin/varnishtest/tests/r01002.vtc
@@ -3,7 +3,7 @@ varnishtest "Real relational comparisons"
 varnish v1 -vcl {
 	import ${vmod_std};
 
-	backend foo { .host = "${bad_ip}"; }
+	backend foo { .host = "${bad_ip}"; .port = "9080"; }
 	sub vcl_recv {
 		if (std.random(0,5) < 1.0) {
 			return (pipe);
diff --git a/bin/varnishtest/tests/r01395.vtc b/bin/varnishtest/tests/r01395.vtc
index 591bb2e..06962db 100644
--- a/bin/varnishtest/tests/r01395.vtc
+++ b/bin/varnishtest/tests/r01395.vtc
@@ -2,7 +2,8 @@ varnishtest "Test vcl_synth is called even if vcl_backend_fetch failed"
 
 varnish v1 -vcl {
 	backend default {
-		.host = "${bad_ip}"; .port = "9090";
+		.host = "${bad_ip}";
+		.port = "9090";
 	}
 
 	sub vcl_backend_error {
diff --git a/bin/varnishtest/tests/r01398.vtc b/bin/varnishtest/tests/r01398.vtc
index fe89e0d..ec0003e 100644
--- a/bin/varnishtest/tests/r01398.vtc
+++ b/bin/varnishtest/tests/r01398.vtc
@@ -2,7 +2,8 @@ varnishtest "ticket 1398"
 
 varnish v1 -vcl {
 	backend foo {
-		.host = "${bad_ip}"; .port = "9080";
+		.host = "${bad_ip}";
+		.port = "9080";
 	}
 	sub vcl_backend_response {
 		set beresp.http.X-BE-Name = beresp.backend.name;
diff --git a/bin/varnishtest/tests/r01504.vtc b/bin/varnishtest/tests/r01504.vtc
index 0277c65..8a466f7 100644
--- a/bin/varnishtest/tests/r01504.vtc
+++ b/bin/varnishtest/tests/r01504.vtc
@@ -3,6 +3,7 @@ varnishtest "unreferenced acls"
 varnish v1 -arg "-p vcc_err_unref=off" -vcl {
 	backend s1 {
 		.host = "${bad_ip}";
+		.port = "9090";
 	}
 	acl foo {
 		"127.0.0.1";
diff --git a/bin/varnishtest/tests/r01510.vtc b/bin/varnishtest/tests/r01510.vtc
index 47b87cb..6b74f54 100644
--- a/bin/varnishtest/tests/r01510.vtc
+++ b/bin/varnishtest/tests/r01510.vtc
@@ -11,7 +11,7 @@ varnish v1 -errvcl {Object name 'first' already used.} {
 varnish v1 -errvcl {Object name 'first' already used.} {
 	import ${vmod_debug};
 
-	backend first { .host = "${bad_ip}"; }
+	backend first { .host = "${bad_ip}"; .port = "9080"; }
 
 	sub vcl_init {
 		new first = debug.obj("FOO");
diff --git a/bin/varnishtest/tests/r01512.vtc b/bin/varnishtest/tests/r01512.vtc
index 71496a2..87556f1 100644
--- a/bin/varnishtest/tests/r01512.vtc
+++ b/bin/varnishtest/tests/r01512.vtc
@@ -33,7 +33,7 @@ client c1 {
 # Then across v_b_e and v_b_f
 
 varnish v1 -vcl {
-	backend bad { .host = "${bad_ip}"; }
+	backend bad { .host = "${bad_ip}"; .port = "9080"; }
 	sub vcl_backend_fetch {
 		set bereq.backend = bad;
 		if (bereq.http.x-abandon == "2") {
diff --git a/bin/varnishtest/tests/r01730.vtc b/bin/varnishtest/tests/r01730.vtc
index 2e15ead..e54a410 100644
--- a/bin/varnishtest/tests/r01730.vtc
+++ b/bin/varnishtest/tests/r01730.vtc
@@ -1,7 +1,7 @@
 varnishtest "Test connection error on pipe"
 
 varnish v1 -vcl {
-       backend default { .host = "${bad_ip}"; }
+       backend default { .host = "${bad_ip}"; .port = "9080"; }
        sub vcl_recv {
 		return (pipe);
        }



More information about the varnish-commit mailing list