Now the test servers and test cases can run on a custom port number. There's

no fixed port numbers in use anymore. Starting now, the default ports the servers use are 8990 - 8993. There's no option to modify these yet, but changing the $base option in the top of the runtests.pl script.
2004-09-08 08:08:38 +00:00 · 2004-09-08 08:08:38 +00:00 · 2b1673c9c8
parent 702f549a6a
commit 2b1673c9c8
145 changed files with 388 additions and 351 deletions
--- a/tests/data/test1
+++ b/tests/data/test1
@ -27,7 +27,7 @@ http
 simple HTTP GET
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/1
+http://%HOSTIP:%HTTPPORT/1
 </command>
 </client>

@ -39,7 +39,7 @@ http://%HOSTIP:%HOSTPORT/1
 </strip>
 <protocol>
 GET /1 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test10
+++ b/tests/data/test10
@ -19,7 +19,7 @@ http
 simple HTTP PUT from file
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/10 -T log/test10.txt
+http://%HOSTIP:%HTTPPORT/we/want/10 -T log/test10.txt
 </command>
 <file name="log/test10.txt">
 Weird
@ -41,7 +41,7 @@ the
 </strip>
 <protocol>
 PUT /we/want/10 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 78
--- a/tests/data/test11
+++ b/tests/data/test11
@ -43,7 +43,7 @@ http
 simple HTTP Location: following
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/11 -L
+http://%HOSTIP:%HTTPPORT/want/11 -L
 </command>
 </test>

@ -54,12 +54,12 @@ http://%HOSTIP:%HOSTPORT/want/11 -L
 </strip>
 <protocol>
 GET /want/11 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

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

--- a/tests/data/test12
+++ b/tests/data/test12
@ -27,7 +27,7 @@ http
 HTTP range support
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
+http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 </command>
 </test>

@ -39,7 +39,7 @@ http://%HOSTIP:%HOSTPORT/want/12 -r 100-200
 <protocol>
 GET /want/12 HTTP/1.1
 Range: bytes=100-200
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test13
+++ b/tests/data/test13
@ -18,7 +18,7 @@ http
 HTTP custom request 'DELETE'
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
+http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 </command>
 </test>

@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/want/13 -X DELETE
 </strip>
 <protocol>
 DELETE /want/13 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test14
+++ b/tests/data/test14
@ -17,7 +17,7 @@ http
 HTTP HEAD with Connection: close
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/14 -i --head
+http://%HOSTIP:%HTTPPORT/want/14 -i --head
 </command>
 </test>

@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test15
+++ b/tests/data/test15
@ -20,7 +20,7 @@ http
 --write-out test
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
+http://%HOSTIP:%HTTPPORT/want/15 --write-out '%{url_effective} %{http_code} %{size_download}\n'
 </command>
 </test>

@ -34,14 +34,14 @@ Fake: yes
 Content-Length: 26

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

--- a/tests/data/test150
+++ b/tests/data/test150
@ -54,7 +54,7 @@ http
 HTTP with NTLM authorization and --fail
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/150 -u testuser:testpass --ntlm --fail
+http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail
 </command>
 </test>

@ -67,14 +67,14 @@ http://%HOSTIP:%HOSTPORT/150 -u testuser:testpass --ntlm --fail
 GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /150 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test151
+++ b/tests/data/test151
@ -20,7 +20,7 @@ http
 HTTP GET with an error code that might trick authentication
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/151
+http://%HOSTIP:%HTTPPORT/151
 </command>
 </test>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test152
+++ b/tests/data/test152
@ -20,7 +20,7 @@ http
 HTTP GET with an error code that might trick authentication and --fail
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/152 --fail
+http://%HOSTIP:%HTTPPORT/152 --fail
 </command>
 </test>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test153
+++ b/tests/data/test153
@ -56,7 +56,7 @@ http
 HTTP with Digest authorization with stale=true
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HOSTPORT/1530002
+http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002
 </command>
 </test>

@ -68,28 +68,28 @@ http://%HOSTIP:%HOSTPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 </strip>
 <protocol>
 GET /1530001 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test154
+++ b/tests/data/test154
@ -56,7 +56,7 @@ http
 HTTP PUT with --anyauth authorization (picking Digest)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/154 -T log/put154 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/154 -T log/put154 -u testuser:testpass --anyauth
 </command>
 <file name="log/put154">
 This is data we upload with PUT
@ -73,14 +73,14 @@ four is the number of lines
 </strip>
 <protocol>
 HEAD /154 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 85
--- a/tests/data/test155
+++ b/tests/data/test155
@ -74,7 +74,7 @@ http
 HTTP PUT with --anyauth authorization (picking NTLM)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/155 -T log/put155 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/155 -T log/put155 -u testuser:testpass --anyauth
 </command>
 <file name="log/put155">
 This is data we upload with PUT
@ -91,20 +91,20 @@ four is the number of lines
 </strip>
 <protocol>
 HEAD /155 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 HEAD /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 PUT /155 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 85
--- a/tests/data/test156
+++ b/tests/data/test156
@ -42,7 +42,7 @@ http
 HTTP PUT with --anyauth (when the server requires none)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/156 -T log/put156 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/156 -T log/put156 -u testuser:testpass --anyauth
 </command>
 <file name="log/put156">
 This is data we upload with PUT
@ -59,13 +59,13 @@ four is the number of lines
 </strip>
 <protocol>
 HEAD /156 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 85
--- a/tests/data/test157
+++ b/tests/data/test157
@ -19,7 +19,7 @@ http
 HTTP GET with --anyauth (when the server requires none)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/157 -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
 </command>
 </client>

@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/157 -u testuser:testpass --anyauth
 </strip>
 <protocol>
 GET /157 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test158
+++ b/tests/data/test158
@ -16,7 +16,7 @@ http
 HTTP multipart formpost with only a 100 reply
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/158 -F name=daniel
+http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 </command>
 </client>

@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 145
--- a/tests/data/test159
+++ b/tests/data/test159
@ -54,7 +54,7 @@ http
 HTTP with NTLM authorization when talking HTTP/1.0
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/159 -u testuser:testpass --ntlm -0
+http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0
 </command>
 </test>

@ -67,14 +67,14 @@ http://%HOSTIP:%HOSTPORT/159 -u testuser:testpass --ntlm -0
 GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /159 HTTP/1.0
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test16
+++ b/tests/data/test16
@ -21,7 +21,7 @@ http
 HTTP with proxy athorization
 </name>
 <command>
- -U fake@user:§§§looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HOSTPORT http://we.want.that.site.com/16
+ -U fake@user:§§§looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/16
 </command>
 </test>

--- a/tests/data/test160
+++ b/tests/data/test160
@ -29,7 +29,7 @@ http
 HTTP with delayed close, conn reuse, connection reset and retry
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/160 http://%HOSTIP:%HOSTPORT/wantmore/1600001
+http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001
 </command>
 </test>

@ -53,12 +53,12 @@ surprise2
 </strip>
 <protocol>
 GET /want/160 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /wantmore/1600001 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test162
+++ b/tests/data/test162
@ -25,7 +25,7 @@ http
 HTTP GET asking for --proxy-ntlm when some other authentication is required
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/162 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:bar --proxy-ntlm --fail
+http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail
 </command>
 </test>

@ -35,10 +35,10 @@ http://%HOSTIP:%HOSTPORT/162 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:b
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-GET http://127.0.0.1:8999/162 HTTP/1.1
+GET http://127.0.0.1:%HTTPPORT/162 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test163
+++ b/tests/data/test163
@ -18,7 +18,7 @@ http
 HTTP multipart formpost with contents from a file
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/163 -F "name=<log/field163" -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/163 -F "name=<log/field163" -F tool=curl
 </command>
 # We create this file before the command is invoked!
 <file name="log/field163">
@ -42,7 +42,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 304
--- a/tests/data/test164
+++ b/tests/data/test164
@ -39,7 +39,7 @@ http
 HTTP range with multiple ranges
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/164 -r 0-10,12-15
+http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 </command>
 </test>

@ -51,7 +51,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test165
+++ b/tests/data/test165
@ -27,7 +27,7 @@ CHARSET=ISO8859-1
 HTTP over proxy with IDN host name
 </name>
 <command>
-http://www.ĺäö.se/page/165 -x %HOSTIP:%HOSTPORT
+http://www.ĺäö.se/page/165 -x %HOSTIP:%HTTPPORT
 </command>
 </test>

--- a/tests/data/test166
+++ b/tests/data/test166
@ -18,7 +18,7 @@ http
 HTTP formpost a file with spaces in name
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/166 -F "name=@log/fie ld 166"
+http://%HOSTIP:%HTTPPORT/we/want/166 -F "name=@log/fie ld 166"
 </command>
 # We create this file before the command is invoked!
 <file name="log/fie ld 166">
@ -34,7 +34,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 227
--- a/tests/data/test167
+++ b/tests/data/test167
@ -33,7 +33,7 @@ http
 HTTP with proxy-requiring-Basic to site-requiring-Digest
 </name>
 <command>
-http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:bar --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot
 </command>
 </test>

--- a/tests/data/test168
+++ b/tests/data/test168
@ -47,7 +47,7 @@ http
 HTTP with proxy-requiring-Digest to site-requiring-Digest
 </name>
 <command>
-http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot
 </command>
 </test>

--- a/tests/data/test169
+++ b/tests/data/test169
@ -72,7 +72,7 @@ SSL
 HTTP with proxy-requiring-NTLM to site-requiring-Digest
 </name>
 <command>
-http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:bar --proxy-ntlm --digest --user digest:alot
+http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --digest --user digest:alot
 </command>
 </test>

--- a/tests/data/test17
+++ b/tests/data/test17
@ -29,7 +29,7 @@ request MOOO
 --max-time 180
 </stdin>
 <command>
-K - %HOSTIP:%HOSTPORT/that.site.com/17
+-K - %HOSTIP:%HTTPPORT/that.site.com/17
 </command>
 </test>

@ -38,7 +38,7 @@ request MOOO
 <protocol>
 MOOO /that.site.com/17 HTTP/1.1
 User-Agent: agent007 license to drill	
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test170
+++ b/tests/data/test170
@ -14,7 +14,7 @@ SSL
 HTTP POST with --proxy-ntlm and no SSL with no response
 </name>
 <command>
-http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
+http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value"
 </command>
 </test>

--- a/tests/data/test171
+++ b/tests/data/test171
@ -21,7 +21,7 @@ http
 HTTP, get cookie with dot prefixed full domain
 </name>
 <command>
-c log/jar171 -x %HOSTIP:%HOSTPORT http://z.x.com/171
+-c log/jar171 -x %HOSTIP:%HTTPPORT http://z.x.com/171
 </command>
 </client>

--- a/tests/data/test172
+++ b/tests/data/test172
@ -18,7 +18,7 @@ http
 HTTP with cookies file and custom added cookie
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 </command>
 <file name="log/jar172.txt">
 # Netscape HTTP Cookie File
@ -38,7 +38,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
--- a/tests/data/test173
+++ b/tests/data/test173
@ -19,7 +19,7 @@ http
 HTTP RFC1867-formpost a file from stdin with "faked" filename
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null"
+http://%HOSTIP:%HTTPPORT/we/want/173 -F field1=contents1 -F "fileupload=@-;filename=/dev/null"
 </command>

 <stdin>
@ -42,7 +42,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 359
--- a/tests/data/test174
+++ b/tests/data/test174
@ -42,7 +42,7 @@ http
 HTTP POST --anyauth to server not requiring any auth at all
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 </command>
 </test>

@ -54,13 +54,13 @@ http://%HOSTIP:%HOSTPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 <protocol nonewline=yes>
 HEAD /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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 11
--- a/tests/data/test175
+++ b/tests/data/test175
@ -42,7 +42,7 @@ http
 HTTP POST --digest to server not requiring any auth at all
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/175 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </test>

@ -54,13 +54,13 @@ http://%HOSTIP:%HOSTPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 <protocol nonewline=yes>
 HEAD /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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 11
--- a/tests/data/test176
+++ b/tests/data/test176
@ -46,7 +46,7 @@ http
 HTTP POST --ntlm to server not requiring any auth at all
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 </command>
 </test>

@ -59,13 +59,13 @@ http://%HOSTIP:%HOSTPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 HEAD /176 HTTP/1.1
 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA=
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 11
--- a/tests/data/test177
+++ b/tests/data/test177
@ -19,7 +19,7 @@ http
 HTTP POST --digest to server doing a 302-location response
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/177 -u auser:apasswd --digest -d "junkelijunk"
+http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 </command>
 </test>

@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 <protocol>
 HEAD /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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test178
+++ b/tests/data/test178
@ -22,7 +22,7 @@ http
 simple HTTP GET with negative Content-Length
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/178
+http://%HOSTIP:%HTTPPORT/178
 </command>
 </client>

@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT/178
 </strip>
 <protocol>
 GET /178 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test179
+++ b/tests/data/test179
@ -21,7 +21,7 @@ http
 HTTP using proxy and cookies with path checks
 </name>
 <command>
-http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HOSTPORT
+http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HTTPPORT
 </command>
 <file name="log/injar179">
 supertrooper.fake	FALSE	/a	FALSE	2139150993	mooo	indeed
--- a/tests/data/test18
+++ b/tests/data/test18
@ -32,7 +32,7 @@ http
 multiple requests using {} in URL
 </name>
 <command>
-'%HOSTIP:%HOSTPORT/{18,180002,180003}'
+'%HOSTIP:%HTTPPORT/{18,180002,180003}'
 </command>
 </test>

@ -44,37 +44,37 @@ 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

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

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

 foo
--_curl_--127.0.0.1:8999/180003
+--_curl_--127.0.0.1:%HTTPPORT/180003
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 4
--- a/tests/data/test180
+++ b/tests/data/test180
@ -18,7 +18,7 @@ http
 HTTP 1.0 PUT
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/180 -T log/test180.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/180 -T log/test180.txt --http1.0
 </command>
 <file name="log/test180.txt">
 Weird
@ -40,7 +40,7 @@ the
 </strip>
 <protocol>
 PUT /we/want/180 HTTP/1.0
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 78
--- a/tests/data/test181
+++ b/tests/data/test181
@ -18,7 +18,7 @@ http
 HTTP 1.0 POST
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/181 --data-binary @log/test181.txt --http1.0
+http://%HOSTIP:%HTTPPORT/we/want/181 --data-binary @log/test181.txt --http1.0
 </command>
 <file name="log/test181.txt">
 Weird
@ -40,7 +40,7 @@ the
 </strip>
 <protocol>
 POST /we/want/181 HTTP/1.0
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 79
--- a/tests/data/test183
+++ b/tests/data/test183
@ -21,7 +21,7 @@ SSL
 HTTP GET two URLs over a single proxy with persistent connection
 </name>
 <command>
-http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HOSTPORT
+http://deathstar.another.galaxy/183 http://a.galaxy.far.far.away/183 --proxy http://%HOSTIP:%HTTPPORT
 </command>
 </test>

--- a/tests/data/test2
+++ b/tests/data/test2
@ -21,7 +21,7 @@ http
 HTTP GET with user and password
 </name>
 <command>
- -u fake:user http://%HOSTIP:%HOSTPORT/2
+ -u fake:user http://%HOSTIP:%HTTPPORT/2
 </command>
 </test>

@ -34,7 +34,7 @@ HTTP GET with user and password
 <protocol>
 GET /2 HTTP/1.1
 Authorization: Basic ZmFrZTp1c2Vy
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test22
+++ b/tests/data/test22
--- a/tests/data/test23
+++ b/tests/data/test23
@ -13,7 +13,7 @@ http
 unsupported protocol:// URL
 </name>
 <command>
-htfp://%HOSTIP:%HOSTPORT/none.htfml
+htfp://%HOSTIP:%HTTPPORT/none.htfml
 </command>
 </test>

--- a/tests/data/test24
+++ b/tests/data/test24
@ -17,7 +17,7 @@ http
 HTTP GET fail silently on HTTP error return
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/24 --fail
+http://%HOSTIP:%HTTPPORT/24 --fail
 </command>
 </test>

@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test25
+++ b/tests/data/test25
@ -58,7 +58,7 @@ http
 looping HTTP Location: following with --max-redirs, no persistance
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5
+http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 </command>
 </test>

@ -70,37 +70,37 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test26
+++ b/tests/data/test26
@ -18,7 +18,7 @@ http
 specify more -o than URLs
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/26 -o - -o -
+http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 </command>
 </test>

@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test27
+++ b/tests/data/test27
@ -18,7 +18,7 @@ http
 Get same cookie page several times
 </name>
 <command>
-'http://%HOSTIP:%HOSTPORT/want/{27,27,27}' -b none
+'http://%HOSTIP:%HTTPPORT/want/{27,27,27}' -b none
 </command>
 </test>

@ -29,18 +29,18 @@ Get same cookie page several times
 </strip>
 <protocol>
 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Cookie: thewinneris=nowayyouwin

 GET /want/27 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Cookie: thewinneris=nowayyouwin
--- a/tests/data/test28
+++ b/tests/data/test28
@ -43,7 +43,7 @@ http
 HTTP Location: following with extra spaces in header
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/28 -L
+http://%HOSTIP:%HTTPPORT/want/28 -L
 </command>
 </test>

@ -54,12 +54,12 @@ http://%HOSTIP:%HOSTPORT/want/28 -L
 </strip>
 <protocol>
 GET /want/28 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

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

--- a/tests/data/test29
+++ b/tests/data/test29
@ -21,7 +21,7 @@ http
 HTTP with 2 secs timeout
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/29 -m 2
+http://%HOSTIP:%HTTPPORT/want/29 -m 2
 </command>
 </test>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/want/29 -m 2
 </strip>
 <protocol>
 GET /want/29 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test3
+++ b/tests/data/test3
@ -28,7 +28,7 @@ http
 HTTP POST with auth and contents but with content-length set to 0
 </name>
 <command>
- -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HOSTPORT/3
+ -d "fooo=mooo&pooo=clue&doo=%20%20%20++++" -u "fake:-user" http://%HOSTIP:%HTTPPORT/3
 </command>
 </test>

@ -41,7 +41,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 37
--- a/tests/data/test30
+++ b/tests/data/test30
@ -13,7 +13,7 @@ http
 HTTP with no data in server reply
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/30
+http://%HOSTIP:%HTTPPORT/want/30
 </command>
 </test>

@ -24,7 +24,7 @@ http://%HOSTIP:%HOSTPORT/want/30
 </strip>
 <protocol>
 GET /want/30 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

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

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

--- a/tests/data/test302
+++ b/tests/data/test302
@ -14,7 +14,7 @@ https
 HTTPS GET over HTTP proxy fails
 </name>
 <command>
-k -U fake:user -x %HOSTIP:%HOSTPORT https://bad.fakeurl-to.test/slash/302
+-k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test/slash/302
 </command>
 </test>

--- a/tests/data/test303
+++ b/tests/data/test303
@ -21,7 +21,7 @@ https
 HTTPS with 2 secs timeout
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/303 -m 2
+http://%HOSTIP:%HTTPPORT/want/303 -m 2
 </command>
 </test>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/want/303 -m 2
 </strip>
 <protocol>
 GET /want/303 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test304
+++ b/tests/data/test304
@ -35,7 +35,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:8433
+Host: 127.0.0.1:%HTTPSPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 1390
--- a/tests/data/test305
+++ b/tests/data/test305
@ -13,7 +13,7 @@ https
 insecure HTTPS without permission
 </name>
 <command>
-https://%HOSTIP:%HOSTPORT/want/305 --cacert moooo
+https://%HOSTIP:%HTTPPORT/want/305 --cacert moooo
 </command>
 </test>

--- a/tests/data/test306
+++ b/tests/data/test306
@ -46,7 +46,7 @@ HTTPS GET, receive no headers only data!
 </strip>
 <protocol>
 GET /306 HTTP/1.1
-Host: 127.0.0.1:8433
+Host: 127.0.0.1:%HTTPSPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test31
+++ b/tests/data/test31
@ -31,7 +31,7 @@ http
 HTTP with weirdly formatted cookies and cookiejar storage
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt
+http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt
 </command>
 </test>

@ -42,7 +42,7 @@ http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt
 </strip>
 <protocol>
 GET /we/want/31 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test32
+++ b/tests/data/test32
@ -27,7 +27,7 @@ http
 HTTP with -d and -G
 </name>
 <command>
-d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/32 -G
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/32 -G
 </command>
 </client>

@ -40,7 +40,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test33
+++ b/tests/data/test33
@ -27,7 +27,7 @@ HTTP PUT with resume
 012345678
 </file>
 <command>
-http://%HOSTIP:%HOSTPORT/33 -Tlog/test33.txt -C 50
+http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
 </command>
 </test>

@ -40,7 +40,7 @@ http://%HOSTIP:%HOSTPORT/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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 50
--- a/tests/data/test34
+++ b/tests/data/test34
@ -37,7 +37,7 @@ http
 HTTP GET with chunked Transfer-Encoding
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/34
+http://%HOSTIP:%HTTPPORT/34
 </command>
 </test>

@ -49,7 +49,7 @@ http://%HOSTIP:%HOSTPORT/34
 </strip>
 <protocol>
 GET /34 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test36
+++ b/tests/data/test36
@ -33,7 +33,7 @@ http
 HTTP GET with bad chunked Transfer-Encoding
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/36
+http://%HOSTIP:%HTTPPORT/36
 </command>
 </test>

@ -48,7 +48,7 @@ http://%HOSTIP:%HOSTPORT/36
 </strip>
 <protocol>
 GET /36 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test37
+++ b/tests/data/test37
@ -15,7 +15,7 @@ http
 HTTP GET with nothing returned from server
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/37
+http://%HOSTIP:%HTTPPORT/37
 </command>
 </test>

@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/37
 </strip>
 <protocol>
 GET /37 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test38
+++ b/tests/data/test38
@ -19,7 +19,7 @@ http
 HTTP resume request without server supporting it
 </name>
 <command option="no-output">
-http://%HOSTIP:%HOSTPORT/want/38 -C - -i -o log/fewl.txt
+http://%HOSTIP:%HTTPPORT/want/38 -C - -i -o log/fewl.txt
 </command>
 <file name="log/fewl.txt">
 This text is here to simulate a partly downloaded file to resume
@ -38,7 +38,7 @@ download on.
 <protocol>
 GET /want/38 HTTP/1.1
 Range: bytes=78-
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test39
+++ b/tests/data/test39
@ -19,7 +19,7 @@ http
 HTTP RFC1867-type formposting with filename= and type=
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/39 -F name=daniel -F tool=curl -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar" -F file2=@log/test39.txt
+http://%HOSTIP:%HTTPPORT/we/want/39 -F name=daniel -F tool=curl -F "file=@log/test39.txt;filename=fakerfile;type=moo/foobar" -F file2=@log/test39.txt
 </command>
 # We create this file before the command is invoked!
 <file name="log/test39.txt">
@ -38,7 +38,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 598
--- a/tests/data/test4
+++ b/tests/data/test4
@ -21,7 +21,7 @@ http
 Replaced internal and added custom HTTP headers
 </name>
 <command>
- -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4
+ -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HTTPPORT/4
 </command>
 </test>

@ -33,7 +33,7 @@ Replaced internal and added custom HTTP headers
 </strip>
 <protocol>
 GET /4 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 extra-header: here
 Accept: replaced
--- a/tests/data/test40
+++ b/tests/data/test40
@ -41,7 +41,7 @@ http
 HTTP redirect with whitespace after ? (and conversion)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/40 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test41
+++ b/tests/data/test41
@ -11,7 +11,7 @@ http
 HTTP formpost with missing file
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/41 -F moo=@boo
+http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo
 </command>
 </test>

--- a/tests/data/test42
+++ b/tests/data/test42
@ -41,7 +41,7 @@ http
 HTTP redirect with whitespace in path (and conversion)
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/42 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test43
+++ b/tests/data/test43
@ -43,7 +43,7 @@ http
 HTTP Location: following over HTTP proxy
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT
+http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT
 </command>
 </test>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:8999/want/43 HTTP/1.1
-Host: 127.0.0.1:8999
+GET http://127.0.0.1:%HTTPPORT/want/43 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

-GET http://127.0.0.1:8999/want/data/430002.txt?coolsite=yes HTTP/1.1
-Host: 127.0.0.1:8999
+GET http://127.0.0.1:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test44
+++ b/tests/data/test44
@ -19,7 +19,7 @@ http
 HTTP RFC1867-type formposting without Expect: header
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/44 -F name=daniel -F tool=curl -F file=@log/test44.txt -H 'Expect:'
+http://%HOSTIP:%HTTPPORT/we/want/44 -F name=daniel -F tool=curl -F file=@log/test44.txt -H 'Expect:'
 </command>
 # We create this file before the command is invoked!
 <file name="log/test44.txt">
@ -37,7 +37,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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 412
--- a/tests/data/test45
+++ b/tests/data/test45
@ -43,7 +43,7 @@ http
 simple HTTP Location: without protocol in initial URL
 </name>
 <command>
-%HOSTIP:%HOSTPORT/want/45 -L
+%HOSTIP:%HTTPPORT/want/45 -L
 </command>
 </test>

@ -54,12 +54,12 @@ simple HTTP Location: without protocol in initial URL
 </strip>
 <protocol>
 GET /want/45 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

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

--- a/tests/data/test46
+++ b/tests/data/test46
@ -26,7 +26,7 @@ http
 HTTP, get cookies and store in cookie jar
 </name>
 <command>
-%HOSTIP:%HOSTPORT/want/46 -c log/jar46 -b log/injar46
+%HOSTIP:%HTTPPORT/want/46 -c log/jar46 -b log/injar46
 </command>
 <file name="log/injar46">
 # Netscape HTTP Cookie File
@ -47,7 +47,7 @@ www.loser.com	FALSE	/	FALSE	1139150993	UID	99
 </strip>
 <protocol>
 GET /want/46 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Cookie: empty=; mooo=indeed
--- a/tests/data/test47
+++ b/tests/data/test47
@ -20,7 +20,7 @@ http
 simple HTTP 1.0 GET
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/47 -0
+http://%HOSTIP:%HTTPPORT/47 -0
 </command>
 </test>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/47 -0
 </strip>
 <protocol>
 GET /47 HTTP/1.0
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test48
+++ b/tests/data/test48
@ -19,7 +19,7 @@ http
 HTTP with -d and -G and -I
 </name>
 <command>
-d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/48 -G -I
+-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/48 -G -I
 </command>
 </client>

@ -31,7 +31,7 @@ HTTP with -d and -G and -I
 </strip>
 <protocol>
 HEAD /48?foo=moo&moo=poo HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test49
+++ b/tests/data/test49
@ -41,7 +41,7 @@ http
 HTTP follow redirect with ../
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/49 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test5
+++ b/tests/data/test5
@ -21,7 +21,7 @@ http
 HTTP over proxy
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
+http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT
 </command>
 </test>

@ -32,8 +32,8 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT
 ^User-Agent:.*
 </strip>
 <protocol>
-GET http://127.0.0.1:8999/we/want/that/page/5 HTTP/1.1
-Host: 127.0.0.1:8999
+GET http://127.0.0.1:%HTTPPORT/we/want/that/page/5 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test50
+++ b/tests/data/test50
@ -41,7 +41,7 @@ http
 HTTP follow redirect with ../../
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/50 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test500
+++ b/tests/data/test500
@ -31,7 +31,7 @@ lib500
 simple libcurl HTTP GET tool
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/500
+http://%HOSTIP:%HTTPPORT/500
 </command>
 </client>

@ -40,7 +40,7 @@ http://%HOSTIP:%HOSTPORT/500
 <verify>
 <protocol>
 GET /500 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test501
+++ b/tests/data/test501
@ -17,7 +17,7 @@ lib501
 simple libcurl attempt operation without URL set
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/501
+http://%HOSTIP:%HTTPPORT/501
 </command>
 </client>

--- a/tests/data/test503
+++ b/tests/data/test503
@ -34,7 +34,7 @@ lib503
 simple multi http:// through proxytunnel with authentication info
 </name>
 <command>
-http://%HOSTIP:%HTTPSPORT/503 localhost:%HOSTPORT
+http://%HOSTIP:%HTTPSPORT/503 localhost:%HTTPPORT
 </command>
 <file name="log/test503.txt">
 foo
@ -48,12 +48,12 @@ moo
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT 127.0.0.1:8433 HTTP/1.0
+CONNECT 127.0.0.1:%HTTPSPORT HTTP/1.0
 Proxy-Authorization: Basic dGVzdDppbmc=

 GET /503 HTTP/1.1
 Authorization: Basic dGVzdDppbmc=
-Host: 127.0.0.1:8433
+Host: 127.0.0.1:%HTTPSPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test506
+++ b/tests/data/test506
@ -50,7 +50,7 @@ HTTP with shared cookie list (and dns cache)
 lib506
 </tool>
 <command>
-http://%HOSTIP:%HOSTPORT/506
+http://%HOSTIP:%HTTPPORT/506
 </command>
 </client>

@ -139,7 +139,7 @@ unlock: share  <Pigs in space>: 55
 GLOBAL_CLEANUP
 </stdout>
 <stderr>
-http://%HOSTIP:%HOSTPORT/506 
+http://%HOSTIP:%HTTPPORT/506 
 </stderr>
 <file name="log/jar506">
 # Netscape HTTP Cookie File
--- a/tests/data/test508
+++ b/tests/data/test508
@ -26,7 +26,7 @@ lib508
 send HTTP POST using read callback
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/508
+http://%HOSTIP:%HTTPPORT/508
 </command>
 </client>

@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/508
 <verify>
 <protocol>
 POST /508 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 45
--- a/tests/data/test509
+++ b/tests/data/test509
@ -4,7 +4,6 @@
 <data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: localhost:8433
 Content-length:6

 Hello
@ -31,7 +30,7 @@ lib509
 simple HTTPS GET and URL redirect in certificate
 </name>
 <command>
-https://localhost:%HTTPSPORT/dvcs
+https://localhost:%HTTPSPORT/dvcs %HTTPSPORT
 </command>
 </client>

@ -43,7 +42,7 @@ https://localhost:%HTTPSPORT/dvcs
 </strip>
 <protocol>
 GET /509 HTTP/1.1
-Host: localhost:8433
+Host: localhost:%HTTPSPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test51
+++ b/tests/data/test51
@ -41,7 +41,7 @@ http
 HTTP follow redirect with exessive ../
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/51 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /510002 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test510
+++ b/tests/data/test510
@ -26,7 +26,7 @@ lib510
 send HTTP POST using read callback, using chunked transfer-encoding
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/510
+http://%HOSTIP:%HTTPPORT/510
 </command>
 </client>

@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/510
 <verify>
 <protocol>
 POST /510 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
--- a/tests/data/test512
+++ b/tests/data/test512
@ -25,7 +25,7 @@ lib512
 simple curl_easy_duplicate() test
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/512
+http://%HOSTIP:%HTTPPORT/512
 </command>
 </client>

@ -37,7 +37,7 @@ http://%HOSTIP:%HOSTPORT/512
 </strip>
 <protocol>
 GET /512 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test513
+++ b/tests/data/test513
@ -17,7 +17,7 @@ lib513
 send HTTP POST using read callback that returns CURL_READFUNC_ABORT
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/513
+http://%HOSTIP:%HTTPPORT/513
 </command>
 </client>

@ -26,7 +26,7 @@ http://%HOSTIP:%HOSTPORT/513
 <verify>
 <protocol>
 POST /513 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 1
--- a/tests/data/test514
+++ b/tests/data/test514
@ -29,7 +29,7 @@ lib514
 First set options to POST and then to make HEAD
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/514
+http://%HOSTIP:%HTTPPORT/514
 </command>
 </client>

@ -41,7 +41,7 @@ http://%HOSTIP:%HOSTPORT/514
 </strip>
 <protocol>
 HEAD /514 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test52
+++ b/tests/data/test52
@ -41,7 +41,7 @@ http
 HTTP follow redirect with ./-prefix
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L
+http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
 </command>
 </client>

@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L
 </strip>
 <protocol>
 GET /we/are/all/twits/52 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /we/are/all/twits/520002 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test53
+++ b/tests/data/test53
@ -21,7 +21,7 @@ http
 HTTP, junk session cookies
 </name>
 <command>
-%HOSTIP:%HOSTPORT/want/53 -b log/injar53 -j
+%HOSTIP:%HTTPPORT/want/53 -b log/injar53 -j
 </command>
 <file name="log/injar53">
 127.0.0.1	FALSE	/	FALSE	2139150993	mooo	indeed
@ -37,7 +37,7 @@ HTTP, junk session cookies
 </strip>
 <protocol>
 GET /want/53 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Cookie: mooo=indeed
--- a/tests/data/test54
+++ b/tests/data/test54
@ -18,7 +18,7 @@ http
 HTTP with blank Location:
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/want/54 -L
+http://%HOSTIP:%HTTPPORT/want/54 -L
 </command>
 </test>

@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/want/54 -L
 </strip>
 <protocol>
 GET /want/54 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test55
+++ b/tests/data/test55
@ -35,7 +35,7 @@ http
 HTTP follow redirect with single slash in path
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/55 -L
+http://%HOSTIP:%HTTPPORT/55 -L
 </command>
 </client>

@ -45,13 +45,13 @@ http://%HOSTIP:%HOSTPORT/55 -L
 </strip>
 <protocol>
 GET /55 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

 GET /550002 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:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test56
+++ b/tests/data/test56
@ -28,7 +28,7 @@ header "Transfer-Encoding: chunked"
 #
 </stdin>
 <command>
-K - %HOSTIP:%HOSTPORT/that.site.com/56
+-K - %HOSTIP:%HTTPPORT/that.site.com/56
 </command>
 </test>

@ -39,7 +39,7 @@ header "Transfer-Encoding: chunked"
 </strip>
 <protocol>
 POST /that.site.com/56 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Transfer-Encoding: chunked
--- a/tests/data/test57
+++ b/tests/data/test57
@ -17,7 +17,7 @@ http
 HTTP content-type with spaces in
 </name>
 <command>
-w '%{content_type}\n' %HOSTIP:%HOSTPORT/57 -o log/out57
+-w '%{content_type}\n' %HOSTIP:%HTTPPORT/57 -o log/out57
 </command>
 </test>

@ -31,7 +31,7 @@ text/html; charset=ISO-8859-4
 </strip>
 <protocol>
 GET /57 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/tests/data/test58
+++ b/tests/data/test58
@ -19,7 +19,7 @@ http
 HTTP PUT from file with weird letters
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT/we/want/ -T log/58te[]st.txt -g
+http://%HOSTIP:%HTTPPORT/we/want/ -T log/58te[]st.txt -g
 </command>
 <file name="log/58te[]st.txt">
 a few bytes
@ -33,7 +33,7 @@ a few bytes
 </strip>
 <protocol>
 PUT /we/want/58te%5B%5Dst%2Etxt HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*
 Content-Length: 12
--- a/tests/data/test59
+++ b/tests/data/test59
@ -20,7 +20,7 @@ http
 HTTP URL with slash but with "parameter"
 </name>
 <command>
-http://%HOSTIP:%HOSTPORT?mooo/59
+http://%HOSTIP:%HTTPPORT?mooo/59
 </command>
 </client>

@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT?mooo/59
 </strip>
 <protocol>
 GET /?mooo/59 HTTP/1.1
-Host: 127.0.0.1:8999
+Host: 127.0.0.1:%HTTPPORT
 Pragma: no-cache
 Accept: */*

--- a/Show More
+++ b/Show More