Replaced 127.0.0.1 with %HOSTIP where possible

2024-12-21 15:48:49 -05:00 · 2007-09-14 19:32:31 +00:00 · 2007-09-14 19:32:31 +00:00 · 05e4a3026d
commit 05e4a3026d
parent 39a416f12a
159 changed files with 249 additions and 249 deletions
--- a/tests/data/test1
+++ b/tests/data/test1
@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/1
 </strip>
 <protocol>
 GET /1 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test10
+++ b/tests/data/test10
@ -48,7 +48,7 @@ the
 </strip>
 <protocol>
 PUT /we/want/10 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
--- a/tests/data/test11
+++ b/tests/data/test11
@ -64,11 +64,11 @@ http://%HOSTIP:%HTTPPORT/want/11 -L
 </strip>
 <protocol>
 GET /want/11 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/110002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test12
+++ b/tests/data/test12
@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 <protocol>
 GET /want/12 HTTP/1.1
 Range: bytes=100-200
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test13
+++ b/tests/data/test13
@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 </strip>
 <protocol>
 DELETE /want/13 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test14
+++ b/tests/data/test14
@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/want/14 -i --head
 <protocol>
 HEAD /want/14 HTTP/1.1
 User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test15
+++ b/tests/data/test15
@ -42,14 +42,14 @@ Fake: yes
 Content-Length: 26

 Repeated nonsense-headers
-http://127.0.0.1:%HTTPPORT/want/15 200 26
+http://%HOSTIP:%HTTPPORT/want/15 200 26
 </stdout>
 <strip>
 ^User-Agent:.*
 </strip>
 <protocol>
 GET /want/15 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test150
+++ b/tests/data/test150
@ -76,13 +76,13 @@ s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAA
 GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test151
+++ b/tests/data/test151
@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/151
 <protocol>
 GET /151 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test152
+++ b/tests/data/test152
@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/152 --fail
 <protocol>
 GET /152 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test153
+++ b/tests/data/test153
@ -73,25 +73,25 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 </strip>
 <protocol>
 GET /1530001 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /1530001 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /1530002 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"
 User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /1530002 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm="MD5"
 User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test154
+++ b/tests/data/test154
@ -77,7 +77,7 @@ four is the number of lines
 </strip>
 <protocol>
 PUT /154 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@ -85,7 +85,7 @@ Expect: 100-continue
 PUT /154 HTTP/1.1
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
--- a/tests/data/test155
+++ b/tests/data/test155
@ -98,14 +98,14 @@ s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAA
 </strippart>
 <protocol>
 PUT /155 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 85
 Expect: 100-continue

 PUT /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 Expect: 100-continue
@ -113,7 +113,7 @@ Expect: 100-continue
 PUT /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
--- a/tests/data/test156
+++ b/tests/data/test156
@ -38,7 +38,7 @@ four is the number of lines
 <protocol>
 PUT /156 HTTP/1.1
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
--- a/tests/data/test157
+++ b/tests/data/test157
@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
 </strip>
 <protocol>
 GET /157 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test158
+++ b/tests/data/test158
@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 <protocol>
 POST /158 HTTP/1.1
 User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 145
 Expect: 100-continue
--- a/tests/data/test159
+++ b/tests/data/test159
@ -75,13 +75,13 @@ s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAA
 GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test160
+++ b/tests/data/test160
@ -54,11 +54,11 @@ surprise2
 </strip>
 <protocol>
 GET /want/160 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /wantmore/1600001 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test162
+++ b/tests/data/test162
@ -35,10 +35,10 @@ http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:b
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-GET http://127.0.0.1:%HTTPPORT/162 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Proxy-Connection: Keep-Alive
--- a/tests/data/test163
+++ b/tests/data/test163
@ -44,7 +44,7 @@ yes please
 <protocol>
 POST /we/want/163 HTTP/1.1
 User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.0.0
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 304
 Expect: 100-continue
--- a/tests/data/test164
+++ b/tests/data/test164
@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 <protocol>
 GET /want/164 HTTP/1.1
 Range: bytes=0-10,12-15
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test166
+++ b/tests/data/test166
@ -36,7 +36,7 @@ data inside the file
 <protocol>
 POST /we/want/166 HTTP/1.1
 User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 223
 Expect: 100-continue
--- a/tests/data/test17
+++ b/tests/data/test17
@ -46,7 +46,7 @@ request MOOO
 <protocol>
 MOOO /that.site.com/17 HTTP/1.1
 User-Agent: agent007 license to drill	
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test172
+++ b/tests/data/test172
@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 </strip>
 <protocol>
 GET /we/want/172 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Cookie: nodomain=value; partmatch=present; tool=curl; name=fool

--- a/tests/data/test173
+++ b/tests/data/test173
@ -44,7 +44,7 @@ line8
 <protocol>
 POST /we/want/173 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 359
 Expect: 100-continue
--- a/tests/data/test174
+++ b/tests/data/test174
@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 <protocol nonewline="yes">
 POST /174 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test175
+++ b/tests/data/test175
@ -60,14 +60,14 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 <protocol nonewline="yes">
 POST /175 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded

 POST /175 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test176
+++ b/tests/data/test176
@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 POST /176 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded

 POST /176 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test177
+++ b/tests/data/test177
@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 <protocol>
 POST /177 HTTP/1.1
 User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test178
+++ b/tests/data/test178
@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/178
 </strip>
 <protocol>
 GET /178 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test18
+++ b/tests/data/test18
@ -52,34 +52,34 @@ multiple requests using {} in URL
 <protocol>
 GET /18 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /180002 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /180003 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
 <stdout>
--_curl_--127.0.0.1:%HTTPPORT/18
+--_curl_--%HOSTIP:%HTTPPORT/18
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4

 moo
--_curl_--127.0.0.1:%HTTPPORT/180002
+--_curl_--%HOSTIP:%HTTPPORT/180002
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4

 foo
--_curl_--127.0.0.1:%HTTPPORT/180003
+--_curl_--%HOSTIP:%HTTPPORT/180003
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
--- a/tests/data/test180
+++ b/tests/data/test180
@ -41,7 +41,7 @@ the
 </strip>
 <protocol>
 PUT /we/want/180 HTTP/1.0
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 78

--- a/tests/data/test181
+++ b/tests/data/test181
@ -41,7 +41,7 @@ the
 </strip>
 <protocol>
 POST /we/want/181 HTTP/1.0
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 79
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test186
+++ b/tests/data/test186
@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <bo
 <protocol>
 POST /we/want/186 HTTP/1.1
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.1 c-ares/1.2.0 libidn/0.5.2
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 305
 Expect: 100-continue
--- a/tests/data/test187
+++ b/tests/data/test187
@ -57,11 +57,11 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
 </strip>
 <protocol>
 GET /?oh=what-weird=test/187 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /root/1870002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test188
+++ b/tests/data/test188
@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/188 -C 50 -L
 GET /188 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /188 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test189
+++ b/tests/data/test189
@ -51,13 +51,13 @@ http://%HOSTIP:%HTTPPORT/189 -C 50 -L
 GET /189 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /189 HTTP/1.1
 Range: bytes=50-
 User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test192
+++ b/tests/data/test192
@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/192 -w '%{num_connects}\n'
 </strip>
 <protocol>
 GET /192 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test193
+++ b/tests/data/test193
@ -44,11 +44,11 @@ http://%HOSTIP:%HTTPPORT/193 -w '%{num_connects}\n' -L
 </strip>
 <protocol>
 GET /193 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /193 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test194
+++ b/tests/data/test194
@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail
 <protocol>
 GET /want/194 HTTP/1.1
 Range: bytes=87-
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test197
+++ b/tests/data/test197
@ -42,11 +42,11 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000
 </strip>
 <protocol>
 GET /197 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /197 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test198
+++ b/tests/data/test198
@ -51,11 +51,11 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000
 </strip>
 <protocol>
 GET /198 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /198 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test2
+++ b/tests/data/test2
@ -42,7 +42,7 @@ HTTP GET with user and password
 <protocol>
 GET /2 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test207
+++ b/tests/data/test207
@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/207
 </strip>
 <protocol>
 GET /207 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test218
+++ b/tests/data/test218
@ -37,7 +37,7 @@ just some tiny teeny contents
 </strip>
 <protocol>
 PUT /218 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Transfer-Encoding: chunked
 Expect: 100-continue
--- a/tests/data/test22
+++ b/tests/data/test22
--- a/tests/data/test220
+++ b/tests/data/test220
@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/220 --compressed
 </strip>
 <protocol>
 GET /220 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Accept-Encoding: deflate, gzip

--- a/tests/data/test221
+++ b/tests/data/test221
@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/221 --compressed
 </strip>
 <protocol>
 GET /221 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Accept-Encoding: deflate, gzip

--- a/tests/data/test222
+++ b/tests/data/test222
@ -190,7 +190,7 @@ http://%HOSTIP:%HTTPPORT/222 --compressed
 </strip>
 <protocol>
 GET /222 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Accept-Encoding: deflate, gzip

--- a/tests/data/test223
+++ b/tests/data/test223
@ -80,7 +80,7 @@ http://%HOSTIP:%HTTPPORT/223 --compressed
 </strip>
 <protocol>
 GET /223 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Accept-Encoding: deflate, gzip

--- a/tests/data/test224
+++ b/tests/data/test224
@ -95,7 +95,7 @@ http://%HOSTIP:%HTTPPORT/224 --compressed
 </strip>
 <protocol>
 GET /224 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Accept-Encoding: deflate, gzip

--- a/tests/data/test24
+++ b/tests/data/test24
@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/24 --fail
 <protocol>
 GET /24 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test249
+++ b/tests/data/test249
@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
 </strip>
 <protocol>
 GET /249 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

--- a/tests/data/test25
+++ b/tests/data/test25
@ -79,32 +79,32 @@ http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 <protocol>
 GET /want/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test256
+++ b/tests/data/test256
@ -46,10 +46,10 @@ download on.
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:%HTTPPORT/want/256 HTTP/1.1
+GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn
 Range: bytes=78-
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Proxy-Connection: Keep-Alive
--- a/tests/data/test26
+++ b/tests/data/test26
@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 <protocol>
 GET /want/26 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test260
+++ b/tests/data/test260
@ -47,7 +47,7 @@ HTTP GET URL without slash but with questionmark
 </strip>
 <protocol>
 GET /?260 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test262
+++ b/tests/data/test262
--- a/tests/data/test266
+++ b/tests/data/test266
@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT/266 -D log/heads266
 </strip>
 <protocol>
 GET /266 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test267
+++ b/tests/data/test267
@ -82,7 +82,7 @@ s/^(Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAA
 POST /267 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Header1: yes
 Header2: no
@ -92,7 +92,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /267 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAA
 User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Header1: yes
 Header2: no
--- a/tests/data/test268
+++ b/tests/data/test268
@ -47,7 +47,7 @@ HTTP POST a non-existing file
 </strip>
 <protocol>
 POST /268 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test269
+++ b/tests/data/test269
@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
 </strip>
 <protocol>
 GET /269 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test27
+++ b/tests/data/test27
@ -38,16 +38,16 @@ Get same cookie page several times
 </strip>
 <protocol>
 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Cookie: thewinneris=nowayyouwin

 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Cookie: thewinneris=nowayyouwin

--- a/tests/data/test273
+++ b/tests/data/test273
@ -69,13 +69,13 @@ http://%HOSTIP:%HTTPPORT/273 -u testuser:testpass --digest
 </strip>
 <protocol>
 GET /273 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /273 HTTP/1.1
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3"
 User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test274
+++ b/tests/data/test274
@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/want/274 -L --max-redirs 0
 <protocol>
 GET /want/274 HTTP/1.1
 User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test276
+++ b/tests/data/test276
@ -64,11 +64,11 @@ HTTP Location: following with multiple question marks in URLs
 </strip>
 <protocol>
 GET /want?uri=http://anything/276?secondq/276 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test277
+++ b/tests/data/test277
@ -43,7 +43,7 @@ s/boundary=----------------------------[a-z0-9]*/boundary=----------------------
 <protocol>
 POST /want/277 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 145
 Expect: 100-continue
--- a/tests/data/test28
+++ b/tests/data/test28
@ -63,11 +63,11 @@ http://%HOSTIP:%HTTPPORT/want/28 -L
 </strip>
 <protocol>
 GET /want/28 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test29
+++ b/tests/data/test29
@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/want/29 -m 2
 </strip>
 <protocol>
 GET /want/29 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test292
+++ b/tests/data/test292
@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
 </strip>
 <protocol>
 GET /292 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test293
+++ b/tests/data/test293
@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
 </strip>
 <protocol>
 GET /293 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test3
+++ b/tests/data/test3
@ -49,7 +49,7 @@ HTTP POST with auth and contents but with content-length set to 0
 <protocol nonewline="yes">
 POST /3 HTTP/1.1
 Authorization: Basic ZmFrZTotdXNlcg==
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 37
 Content-Type: application/x-www-form-urlencoded
--- a/tests/data/test30
+++ b/tests/data/test30
@ -32,7 +32,7 @@ http://%HOSTIP:%HTTPPORT/want/30
 </strip>
 <protocol>
 GET /want/30 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test300
+++ b/tests/data/test300
@ -37,7 +37,7 @@ simple HTTPS GET
 </strip>
 <protocol>
 GET /300 HTTP/1.1
-Host: 127.0.0.1:%HTTPSPORT
+Host: %HOSTIP:%HTTPSPORT
 Accept: */*

 </protocol>
--- a/tests/data/test301
+++ b/tests/data/test301
@ -38,7 +38,7 @@ HTTPS GET with user and password
 <protocol>
 GET /301 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
-Host: 127.0.0.1:%HTTPSPORT
+Host: %HOSTIP:%HTTPSPORT
 Accept: */*

 </protocol>
--- a/tests/data/test303
+++ b/tests/data/test303
@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/want/303 -m 2
 </strip>
 <protocol>
 GET /want/303 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test304
+++ b/tests/data/test304
@ -39,7 +39,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 <protocol>
 POST /we/want/304 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPSPORT
+Host: %HOSTIP:%HTTPSPORT
 Accept: */*
 Content-Length: 1386
 Expect: 100-continue
--- a/tests/data/test306
+++ b/tests/data/test306
@ -50,7 +50,7 @@ HTTPS GET, receive no headers only data!
 </strip>
 <protocol>
 GET /306 HTTP/1.1
-Host: 127.0.0.1:%HTTPSPORT
+Host: %HOSTIP:%HTTPSPORT
 Accept: */*

 </protocol>
--- a/tests/data/test307
+++ b/tests/data/test307
@ -41,7 +41,7 @@ simple HTTPS GET with openssl engine
 </strip>
 <protocol>
 GET /307 HTTP/1.1
-Host: 127.0.0.1:%HTTPSPORT
+Host: %HOSTIP:%HTTPSPORT
 Accept: */*

 </protocol>
--- a/tests/data/test31
+++ b/tests/data/test31
@ -57,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 </strip>
 <protocol>
 GET /we/want/31 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test32
+++ b/tests/data/test32
@ -48,7 +48,7 @@ HTTP with -d and -G
 <protocol>
 GET /32?foo=moo&moo=poo HTTP/1.1
 User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test33
+++ b/tests/data/test33
@ -49,7 +49,7 @@ http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
 PUT /33 HTTP/1.1
 Content-Range: bytes 50-99/100
 User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 50
 Expect: 100-continue
--- a/tests/data/test34
+++ b/tests/data/test34
@ -57,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/34
 </strip>
 <protocol>
 GET /34 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test36
+++ b/tests/data/test36
@ -57,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/36
 </strip>
 <protocol>
 GET /36 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test37
+++ b/tests/data/test37
@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/37
 </strip>
 <protocol>
 GET /37 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test38
+++ b/tests/data/test38
@ -47,7 +47,7 @@ download on.
 <protocol>
 GET /want/38 HTTP/1.1
 Range: bytes=78-
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test39
+++ b/tests/data/test39
@ -45,7 +45,7 @@ foo
 <protocol>
 POST /we/want/39 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 810
 Expect: 100-continue
--- a/tests/data/test4
+++ b/tests/data/test4
@ -42,7 +42,7 @@ Replaced internal and added custom HTTP headers
 </strip>
 <protocol>
 GET /4 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 extra-header: here
 Accept: replaced

--- a/tests/data/test40
+++ b/tests/data/test40
@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/40 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test42
+++ b/tests/data/test42
@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/42 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test43
+++ b/tests/data/test43
@ -64,14 +64,14 @@ http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:%HTTPPORT/want/43 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Proxy-Connection: Keep-Alive

-GET http://127.0.0.1:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Proxy-Connection: Keep-Alive
--- a/tests/data/test44
+++ b/tests/data/test44
@ -45,7 +45,7 @@ bar
 <protocol>
 POST /we/want/44 HTTP/1.1
 User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Content-Length: 408
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
--- a/tests/data/test45
+++ b/tests/data/test45
@ -64,11 +64,11 @@ simple HTTP Location: without protocol in initial URL
 </strip>
 <protocol>
 GET /want/45 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /want/data.cgi?moo=http://&/450002 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test46
+++ b/tests/data/test46
@ -62,7 +62,7 @@ www.loser.com	FALSE	/	FALSE	1139150993	UID	99
 </strip>
 <protocol>
 GET /want/46 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*
 Cookie: empty=; mooo=indeed

--- a/tests/data/test47
+++ b/tests/data/test47
@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/47 -0
 </strip>
 <protocol>
 GET /47 HTTP/1.0
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test48
+++ b/tests/data/test48
@ -39,7 +39,7 @@ HTTP with -d and -G and -I
 </strip>
 <protocol>
 HEAD /48?foo=moo&moo=poo HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test49
+++ b/tests/data/test49
@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/49 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /we/are/all/moo.html/490002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test5
+++ b/tests/data/test5
@ -40,8 +40,8 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:%HTTPPORT/we/want/that/page/5 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Proxy-Connection: Keep-Alive
--- a/tests/data/test50
+++ b/tests/data/test50
@ -61,12 +61,12 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/50 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 GET /we/are/moo.html/500002 HTTP/1.1
 User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/tests/data/test500
+++ b/tests/data/test500
@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/500
 <verify>
 <protocol>
 GET /500 HTTP/1.1
-Host: 127.0.0.1:%HTTPPORT
+Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
--- a/Show More
+++ b/Show More