On FreeBSD at least "localhost" resolves to two address, one IPv4

and one IPv6, resort to "127.0.0.1"

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2780 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishtest/tests/a00000.vtc b/varnish-cache/bin/varnishtest/tests/a00000.vtc
index ff7bf0541cc8ae6ef6ca8f96dd2747c6f5af9676..555e1fde8d104b31a87f093b1ffeb4a100736bbd 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00000.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00000.vtc
@@ -2,14 +2,14 @@
 
 test "basic default HTTP transactions"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        txresp 
 }
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq 
        rxresp
 }

diff --git a/varnish-cache/bin/varnishtest/tests/a00001.vtc b/varnish-cache/bin/varnishtest/tests/a00001.vtc
index 2e90b39c420fc30ae6af000f205f210f22a98173..5a7a5a78d4d1cbbbf125dc69af76be6ea517046b 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00001.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00001.vtc
@@ -2,7 +2,7 @@
 
 test "basic default HTTP transactions with expect"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.request == GET
        expect req.proto == HTTP/1.1
@@ -12,7 +12,7 @@ server s1 -listen localhost:9080 {
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq 
        rxresp
        expect resp.proto == HTTP/1.1

diff --git a/varnish-cache/bin/varnishtest/tests/a00002.vtc b/varnish-cache/bin/varnishtest/tests/a00002.vtc
index 9d9da64cfc642c3fbf9ddc465847472a547a53b6..03397f621ff0fdebd85d516b409bcd3647883056 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00002.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00002.vtc
@@ -2,7 +2,7 @@
 
 test "basic default HTTP transactions with expect and options"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.request == PUT
        expect req.proto == HTTP/1.0
@@ -12,7 +12,7 @@ server s1 -listen localhost:9080 {
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo
        rxresp
        expect resp.proto == HTTP/1.2

diff --git a/varnish-cache/bin/varnishtest/tests/a00003.vtc b/varnish-cache/bin/varnishtest/tests/a00003.vtc
index 04f33a1ccdc8fd5f5e2777ec3a0631e959269415..9c9e5cf0e1a01dc6c4d575be9526147926c2f8d5 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00003.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00003.vtc
@@ -2,7 +2,7 @@
 
 test "dual independent HTTP transactions"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.request == PUT
        expect req.proto == HTTP/1.0
@@ -10,7 +10,7 @@ server s1 -listen localhost:9080 {
        txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s2 -listen localhost:9081 {
+server s2 -listen 127.0.0.1:9081 {
        rxreq
        expect req.request == GET
        expect req.proto == HTTP/1.1
@@ -21,7 +21,7 @@ server s2 -listen localhost:9081 {
 server s1 -start 
 server s2 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo
        rxresp
        expect resp.proto == HTTP/1.2
@@ -29,7 +29,7 @@ client c1 -connect localhost:9080 {
        expect resp.msg == Foo
 }
 
-client c2 -connect localhost:9081 {
+client c2 -connect 127.0.0.1:9081 {
        txreq 
        rxresp
        expect resp.proto == HTTP/1.1

diff --git a/varnish-cache/bin/varnishtest/tests/a00004.vtc b/varnish-cache/bin/varnishtest/tests/a00004.vtc
index 5f219c4e8c53b92f6d3a803ad80bd13822e41401..1acaac881b3daaa5844f6a3a6eea97efe3c03da6 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00004.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00004.vtc
@@ -2,7 +2,7 @@
 
 test "dual shared server HTTP transactions"
 
-server s1 -listen localhost:9080 -repeat 2 {
+server s1 -listen 127.0.0.1:9080 -repeat 2 {
        rxreq
        expect req.request == PUT
        expect req.proto == HTTP/1.0
@@ -12,7 +12,7 @@ server s1 -listen localhost:9080 -repeat 2 {
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo
        rxresp
        expect resp.proto == HTTP/1.2
@@ -20,7 +20,7 @@ client c1 -connect localhost:9080 {
        expect resp.msg == Foo
 }
 
-client c2 -connect localhost:9080 {
+client c2 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo
        rxresp
        expect resp.proto == HTTP/1.2

diff --git a/varnish-cache/bin/varnishtest/tests/a00005.vtc b/varnish-cache/bin/varnishtest/tests/a00005.vtc
index a4192a83738acc9d5f5ad0597cf9282d71f4f593..4a5a2ce2dba6efb8f47b8cdffa7cf445ef563be0 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00005.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00005.vtc
@@ -2,7 +2,7 @@
 
 test "dual shared client HTTP transactions"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.request == PUT
        expect req.proto == HTTP/1.0
@@ -10,7 +10,7 @@ server s1 -listen localhost:9080 {
        txresp -proto HTTP/1.2 -status 201 -msg Foo
 }
 
-server s2 -listen localhost:9081 {
+server s2 -listen 127.0.0.1:9081 {
        rxreq
        expect req.request == GET
        expect req.proto == HTTP/1.1
@@ -21,7 +21,7 @@ server s2 -listen localhost:9081 {
 server s1 -start 
 server s2 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo
        rxresp
        expect resp.proto == HTTP/1.2
@@ -31,7 +31,7 @@ client c1 -connect localhost:9080 {
 
 client c1 -run
 
-client c1 -connect localhost:9081 {
+client c1 -connect 127.0.0.1:9081 {
        txreq 
        rxresp
        expect resp.proto == HTTP/1.1

diff --git a/varnish-cache/bin/varnishtest/tests/a00006.vtc b/varnish-cache/bin/varnishtest/tests/a00006.vtc
index 94532b2556ac64241b09113989e5f22656fa4c19..6af785a48f869acf50e46cfd65f96a5a7f8179ba 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00006.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00006.vtc
@@ -2,7 +2,7 @@
 
 test "bidirectional message bodies"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.request == PUT
        expect req.proto == HTTP/1.0
@@ -14,7 +14,7 @@ server s1 -listen localhost:9080 {
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -req PUT -proto HTTP/1.0 -url /foo \
                -hdr "Content-Length: 10" \
                -body "123456789\n"

diff --git a/varnish-cache/bin/varnishtest/tests/a00007.vtc b/varnish-cache/bin/varnishtest/tests/a00007.vtc
index 629f481135529e14e518e6d294da2160d461c7b8..5040ae98603c08916f681fd0f945a7faa68c433f 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/a00007.vtc
+++ b/varnish-cache/bin/varnishtest/tests/a00007.vtc
@@ -2,7 +2,7 @@
 
 test "TCP reuse"
 
-server s1 -listen localhost:9080 {
+server s1 -listen 127.0.0.1:9080 {
        rxreq
        expect req.url == "/1"
        txresp -hdr "Content-Length: 10" -body "123456789\n"
@@ -13,7 +13,7 @@ server s1 -listen localhost:9080 {
 
 server s1 -start 
 
-client c1 -connect localhost:9080 {
+client c1 -connect 127.0.0.1:9080 {
        txreq -url "/1" -req "POST" \
            -hdr "Content-Length: 10" -body "abcdefghi\n"
        rxresp

diff --git a/varnish-cache/bin/varnishtest/tests/b00000.vtc b/varnish-cache/bin/varnishtest/tests/b00000.vtc
index fcdf1b2704b7a6cba268f774f0adbf323700a0cb..f9f9e679b88d898fd434361e51501809e9fb537d 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/b00000.vtc
+++ b/varnish-cache/bin/varnishtest/tests/b00000.vtc
@@ -2,7 +2,7 @@
 #
 # $Id$
 
-varnish v1 -arg "-b localhost:9080" -start
+varnish v1 -arg "-b 127.0.0.1:9080" -start
 
 server s1 {
        rxreq 

diff --git a/varnish-cache/bin/varnishtest/tests/c00002.vtc b/varnish-cache/bin/varnishtest/tests/c00002.vtc
index 954b0c1e58866ec8a13086725c55d7cd378cc562..ebcc6021be11c04a30619e4f0f29f1a16b2503b6 100644 (file)
--- a/varnish-cache/bin/varnishtest/tests/c00002.vtc
+++ b/varnish-cache/bin/varnishtest/tests/c00002.vtc
@@ -4,7 +4,7 @@
 
 test "Check that multiple thread pools all get started"
 
-varnish v1 -arg "-b localhost:9080 -p thread_pools=9" -start
+varnish v1 -arg "-b 127.0.0.1:9080 -p thread_pools=9" -start
 
 server s1 {
        rxreq 

diff --git a/varnish-cache/bin/varnishtest/vtc_server.c b/varnish-cache/bin/varnishtest/vtc_server.c
index 2834cbf985ae0af185255ebf27dfb4c413a856e6..71ed0534794dbf7062ced0d1868a023a183ba4b6 100644 (file)
--- a/varnish-cache/bin/varnishtest/vtc_server.c
+++ b/varnish-cache/bin/varnishtest/vtc_server.c
@@ -120,7 +120,7 @@ server_new(char *name)
                vtc_log(s->vl, 0, "Server name must start with 's'");
                exit (1);
        }
-       s->listen = "localhost:9080";
+       s->listen = "127.0.0.1:9080";
        AZ(VSS_parse(s->listen, &s->addr, &s->port));
        s->repeat = 1;
        s->depth = 1;
@@ -192,7 +192,7 @@ cmd_server_genvcl(struct vsb *vsb)
                vsb_printf(vsb,
                    "backend %s { .host = \"%s\"; .port = \"%s\"; }\n",
                    s->name,
-                   s->addr == NULL ? "localhost" : s->addr,
+                   s->addr == NULL ? "127.0.0.1" : s->addr,
                    s->port);
        }
 }