[master] 8ede23d Don't assume 127.0.0.1

Federico G. Schwindt fgsch at lodoss.net
Sun Apr 16 12:21:06 CEST 2017


commit 8ede23dece6a73b54ae8aba3f913c1bebf37b7f1
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Apr 16 11:17:16 2017 +0100

    Don't assume 127.0.0.1

diff --git a/bin/varnishtest/tests/u00003.vtc b/bin/varnishtest/tests/u00003.vtc
index b3559bb..4d4b4ea 100644
--- a/bin/varnishtest/tests/u00003.vtc
+++ b/bin/varnishtest/tests/u00003.vtc
@@ -48,7 +48,7 @@ delay 1
 shell "kill `cat ${tmpdir}/ncsa.pid`"
 
 # default formatter and rotation
-shell -match {127.0.0.1 - - \[../.../20[1-9][0-9]:..:..:.. \+....\] (?#
+shell -match {\d+.\d+.\d+.\d+ - - \[../.../20[1-9][0-9]:..:..:.. \+....\] (?#
 )"GET http://localhost/1\?foo=bar HTTP/1.1" 200 0 "-" "-"} \
 	"cat ${tmpdir}/ncsa.old.log"
 shell "grep -q /2 ${tmpdir}/ncsa.log"
@@ -106,11 +106,11 @@ shell -err -expect "Usage: varnishncsa <options>" \
 # -f and standard formatters
 shell {echo "%b %D %H %h %I %{baz}i %l %m %{Age}o %O %q %s %t %{%Y}t \
 %T %U %u" > ${tmpdir}/format}
-shell -match {^\d+ \d+ HTTP/1.1 127.0.0.1 \d+ qux - GET 0 \d+ (?#
+shell -match {^\d+ \d+ HTTP/1.1 \d+.\d+.\d+.\d+ \d+ qux - GET 0 \d+ (?#
 )\?foo=bar 200 \[../.../(20[1-9][0-9]):..:..:.. \+....\] \1 \d+ /1 -
-\d+ \d+ HTTP/1.1 127.0.0.1 \d+ - - GET 0 \d+ (?#
+\d+ \d+ HTTP/1.1 \d+.\d+.\d+.\d+ \d+ - - GET 0 \d+ (?#
 )\?foo=bar 200 \[../.../(20[1-9][0-9]):..:..:.. \+....\] \1 \d+ /1 -
-- \d+ HTTP/1.1 127.0.0.1 \d+ - - GET - \d+ (?#
+- \d+ HTTP/1.1 \d+.\d+.\d+.\d+ \d+ - - GET - \d+ (?#
 ) - \[../.../(20[1-9][0-9]):..:..:.. \+....\] \1 \d+ /2 -$} \
 	{varnishncsa -n ${v1_name} -d -f ${tmpdir}/format}
 



More information about the varnish-commit mailing list