From 2b1673c9c83f693fdf243607f9141e5e897e0ba8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 8 Sep 2004 08:08:38 +0000 Subject: 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. --- tests/data/test1 | 4 ++-- tests/data/test10 | 4 ++-- tests/data/test11 | 6 +++--- tests/data/test12 | 4 ++-- tests/data/test13 | 4 ++-- tests/data/test14 | 4 ++-- tests/data/test15 | 6 +++--- tests/data/test150 | 6 +++--- tests/data/test151 | 4 ++-- tests/data/test152 | 4 ++-- tests/data/test153 | 10 +++++----- tests/data/test154 | 6 +++--- tests/data/test155 | 8 ++++---- tests/data/test156 | 6 +++--- tests/data/test157 | 4 ++-- tests/data/test158 | 4 ++-- tests/data/test159 | 6 +++--- tests/data/test16 | 2 +- tests/data/test160 | 6 +++--- tests/data/test162 | 6 +++--- tests/data/test163 | 4 ++-- tests/data/test164 | 4 ++-- tests/data/test165 | 2 +- tests/data/test166 | 4 ++-- tests/data/test167 | 2 +- tests/data/test168 | 2 +- tests/data/test169 | 2 +- tests/data/test17 | 4 ++-- tests/data/test170 | 2 +- tests/data/test171 | 2 +- tests/data/test172 | 4 ++-- tests/data/test173 | 4 ++-- tests/data/test174 | 6 +++--- tests/data/test175 | 6 +++--- tests/data/test176 | 6 +++--- tests/data/test177 | 4 ++-- tests/data/test178 | 4 ++-- tests/data/test179 | 2 +- tests/data/test18 | 14 +++++++------- tests/data/test180 | 4 ++-- tests/data/test181 | 4 ++-- tests/data/test183 | 2 +- tests/data/test2 | 4 ++-- tests/data/test22 | 4 ++-- tests/data/test23 | 2 +- tests/data/test24 | 4 ++-- tests/data/test25 | 14 +++++++------- tests/data/test26 | 4 ++-- tests/data/test27 | 8 ++++---- tests/data/test28 | 6 +++--- tests/data/test29 | 4 ++-- tests/data/test3 | 4 ++-- tests/data/test30 | 4 ++-- tests/data/test300 | 2 +- tests/data/test301 | 2 +- tests/data/test302 | 2 +- tests/data/test303 | 4 ++-- tests/data/test304 | 2 +- tests/data/test305 | 2 +- tests/data/test306 | 2 +- tests/data/test31 | 4 ++-- tests/data/test32 | 4 ++-- tests/data/test33 | 4 ++-- tests/data/test34 | 4 ++-- tests/data/test36 | 4 ++-- tests/data/test37 | 4 ++-- tests/data/test38 | 4 ++-- tests/data/test39 | 4 ++-- tests/data/test4 | 4 ++-- tests/data/test40 | 6 +++--- tests/data/test41 | 2 +- tests/data/test42 | 6 +++--- tests/data/test43 | 10 +++++----- tests/data/test44 | 4 ++-- tests/data/test45 | 6 +++--- tests/data/test46 | 4 ++-- tests/data/test47 | 4 ++-- tests/data/test48 | 4 ++-- tests/data/test49 | 6 +++--- tests/data/test5 | 6 +++--- tests/data/test50 | 6 +++--- tests/data/test500 | 4 ++-- tests/data/test501 | 2 +- tests/data/test503 | 6 +++--- tests/data/test506 | 4 ++-- tests/data/test508 | 4 ++-- tests/data/test509 | 5 ++--- tests/data/test51 | 6 +++--- tests/data/test510 | 4 ++-- tests/data/test512 | 4 ++-- tests/data/test513 | 4 ++-- tests/data/test514 | 4 ++-- tests/data/test52 | 6 +++--- tests/data/test53 | 4 ++-- tests/data/test54 | 4 ++-- tests/data/test55 | 6 +++--- tests/data/test56 | 4 ++-- tests/data/test57 | 4 ++-- tests/data/test58 | 4 ++-- tests/data/test59 | 4 ++-- tests/data/test6 | 4 ++-- tests/data/test60 | 4 ++-- tests/data/test61 | 2 +- tests/data/test62 | 2 +- tests/data/test63 | 2 +- tests/data/test64 | 6 +++--- tests/data/test65 | 6 +++--- tests/data/test66 | 4 ++-- tests/data/test67 | 6 +++--- tests/data/test68 | 6 +++--- tests/data/test69 | 8 ++++---- tests/data/test7 | 4 ++-- tests/data/test70 | 6 +++--- tests/data/test71 | 4 ++-- tests/data/test72 | 6 +++--- tests/data/test73 | 2 +- tests/data/test74 | 6 +++--- tests/data/test75 | 2 +- tests/data/test76 | 2 +- tests/data/test77 | 4 ++-- tests/data/test78 | 4 ++-- tests/data/test79 | 6 +++--- tests/data/test8 | 4 ++-- tests/data/test80 | 6 +++--- tests/data/test81 | 10 +++++----- tests/data/test82 | 6 +++--- tests/data/test83 | 6 +++--- tests/data/test84 | 6 +++--- tests/data/test85 | 6 +++--- tests/data/test86 | 8 ++++---- tests/data/test87 | 2 +- tests/data/test88 | 6 +++--- tests/data/test89 | 10 +++++----- tests/data/test9 | 4 ++-- tests/data/test90 | 14 +++++++------- tests/data/test91 | 8 ++++---- tests/data/test92 | 4 ++-- tests/data/test93 | 6 +++--- tests/data/test94 | 2 +- tests/data/test95 | 6 +++--- tests/data/test97 | 4 ++-- tests/data/test98 | 4 ++-- tests/data/test99 | 4 ++-- tests/libtest/lib509.c | 17 ++++++++++++++++- tests/runtests.pl | 51 ++++++++++++++++++++++++++++++++++++-------------- 145 files changed, 388 insertions(+), 351 deletions(-) diff --git a/tests/data/test1 b/tests/data/test1 index 0d553230d..cd23462b5 100644 --- a/tests/data/test1 +++ b/tests/data/test1 @@ -27,7 +27,7 @@ http simple HTTP GET -http://%HOSTIP:%HOSTPORT/1 +http://%HOSTIP:%HTTPPORT/1 @@ -39,7 +39,7 @@ http://%HOSTIP:%HOSTPORT/1 GET /1 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test10 b/tests/data/test10 index 9136ec189..e2f0909e6 100644 --- a/tests/data/test10 +++ b/tests/data/test10 @@ -19,7 +19,7 @@ http simple HTTP PUT from file -http://%HOSTIP:%HOSTPORT/we/want/10 -T log/test10.txt +http://%HOSTIP:%HTTPPORT/we/want/10 -T log/test10.txt Weird @@ -41,7 +41,7 @@ the 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 diff --git a/tests/data/test11 b/tests/data/test11 index 837dc9291..932dd2391 100644 --- a/tests/data/test11 +++ b/tests/data/test11 @@ -43,7 +43,7 @@ http simple HTTP Location: following -http://%HOSTIP:%HOSTPORT/want/11 -L +http://%HOSTIP:%HTTPPORT/want/11 -L @@ -54,12 +54,12 @@ http://%HOSTIP:%HOSTPORT/want/11 -L 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: */* diff --git a/tests/data/test12 b/tests/data/test12 index 242246f81..245fde2ae 100644 --- a/tests/data/test12 +++ b/tests/data/test12 @@ -27,7 +27,7 @@ http HTTP range support -http://%HOSTIP:%HOSTPORT/want/12 -r 100-200 +http://%HOSTIP:%HTTPPORT/want/12 -r 100-200 @@ -39,7 +39,7 @@ http://%HOSTIP:%HOSTPORT/want/12 -r 100-200 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: */* diff --git a/tests/data/test13 b/tests/data/test13 index 50b413641..45d0768dc 100644 --- a/tests/data/test13 +++ b/tests/data/test13 @@ -18,7 +18,7 @@ http HTTP custom request 'DELETE' -http://%HOSTIP:%HOSTPORT/want/13 -X DELETE +http://%HOSTIP:%HTTPPORT/want/13 -X DELETE @@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/want/13 -X DELETE DELETE /want/13 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test14 b/tests/data/test14 index 7095bf7a2..bbc4ba68d 100644 --- a/tests/data/test14 +++ b/tests/data/test14 @@ -17,7 +17,7 @@ http HTTP HEAD with Connection: close -http://%HOSTIP:%HOSTPORT/want/14 -i --head +http://%HOSTIP:%HTTPPORT/want/14 -i --head @@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/want/14 -i --head 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: */* diff --git a/tests/data/test15 b/tests/data/test15 index 52225f26f..d42ab7b4f 100644 --- a/tests/data/test15 +++ b/tests/data/test15 @@ -20,7 +20,7 @@ http --write-out test -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' @@ -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 ^User-Agent:.* GET /want/15 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test150 b/tests/data/test150 index ac23de02f..98648cd81 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -54,7 +54,7 @@ http HTTP with NTLM authorization and --fail -http://%HOSTIP:%HOSTPORT/150 -u testuser:testpass --ntlm --fail +http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail @@ -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: */* diff --git a/tests/data/test151 b/tests/data/test151 index f499f96c0..c79ab40dd 100644 --- a/tests/data/test151 +++ b/tests/data/test151 @@ -20,7 +20,7 @@ http HTTP GET with an error code that might trick authentication -http://%HOSTIP:%HOSTPORT/151 +http://%HOSTIP:%HTTPPORT/151 @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/151 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: */* diff --git a/tests/data/test152 b/tests/data/test152 index 7edd0afc8..86ac68d24 100644 --- 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 -http://%HOSTIP:%HOSTPORT/152 --fail +http://%HOSTIP:%HTTPPORT/152 --fail @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/152 --fail 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: */* diff --git a/tests/data/test153 b/tests/data/test153 index 0cf0acd1f..a2d15191a 100644 --- a/tests/data/test153 +++ b/tests/data/test153 @@ -56,7 +56,7 @@ http HTTP with Digest authorization with stale=true -http://%HOSTIP:%HOSTPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HOSTPORT/1530002 +http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/1530002 @@ -68,28 +68,28 @@ http://%HOSTIP:%HOSTPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H 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: */* diff --git a/tests/data/test154 b/tests/data/test154 index b9b9649c7..07be0c6b4 100644 --- a/tests/data/test154 +++ b/tests/data/test154 @@ -56,7 +56,7 @@ http HTTP PUT with --anyauth authorization (picking Digest) -http://%HOSTIP:%HOSTPORT/154 -T log/put154 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/154 -T log/put154 -u testuser:testpass --anyauth This is data we upload with PUT @@ -73,14 +73,14 @@ four is the number of lines 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 diff --git a/tests/data/test155 b/tests/data/test155 index 0e486a65e..56322ebe2 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -74,7 +74,7 @@ http HTTP PUT with --anyauth authorization (picking NTLM) -http://%HOSTIP:%HOSTPORT/155 -T log/put155 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/155 -T log/put155 -u testuser:testpass --anyauth This is data we upload with PUT @@ -91,20 +91,20 @@ four is the number of lines 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 diff --git a/tests/data/test156 b/tests/data/test156 index 94ac0ed98..f2f4aaabc 100644 --- a/tests/data/test156 +++ b/tests/data/test156 @@ -42,7 +42,7 @@ http HTTP PUT with --anyauth (when the server requires none) -http://%HOSTIP:%HOSTPORT/156 -T log/put156 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/156 -T log/put156 -u testuser:testpass --anyauth This is data we upload with PUT @@ -59,13 +59,13 @@ four is the number of lines 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 diff --git a/tests/data/test157 b/tests/data/test157 index 3f6ed3691..c48d36fad 100644 --- a/tests/data/test157 +++ b/tests/data/test157 @@ -19,7 +19,7 @@ http HTTP GET with --anyauth (when the server requires none) -http://%HOSTIP:%HOSTPORT/157 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth @@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/157 -u testuser:testpass --anyauth GET /157 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test158 b/tests/data/test158 index 95ad05978..463b7a5a4 100644 --- a/tests/data/test158 +++ b/tests/data/test158 @@ -16,7 +16,7 @@ http HTTP multipart formpost with only a 100 reply -http://%HOSTIP:%HOSTPORT/158 -F name=daniel +http://%HOSTIP:%HTTPPORT/158 -F name=daniel @@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/158 -F name=daniel 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 diff --git a/tests/data/test159 b/tests/data/test159 index 09a9838f7..7ad1c76a8 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -54,7 +54,7 @@ http HTTP with NTLM authorization when talking HTTP/1.0 -http://%HOSTIP:%HOSTPORT/159 -u testuser:testpass --ntlm -0 +http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0 @@ -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: */* diff --git a/tests/data/test16 b/tests/data/test16 index 4adea4a8d..2bdd46e60 100644 --- a/tests/data/test16 +++ b/tests/data/test16 @@ -21,7 +21,7 @@ http HTTP with proxy athorization - -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 diff --git a/tests/data/test160 b/tests/data/test160 index 48f6aa549..26ef7ec72 100644 --- a/tests/data/test160 +++ b/tests/data/test160 @@ -29,7 +29,7 @@ http HTTP with delayed close, conn reuse, connection reset and retry -http://%HOSTIP:%HOSTPORT/want/160 http://%HOSTIP:%HOSTPORT/wantmore/1600001 +http://%HOSTIP:%HTTPPORT/want/160 http://%HOSTIP:%HTTPPORT/wantmore/1600001 @@ -53,12 +53,12 @@ surprise2 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: */* diff --git a/tests/data/test162 b/tests/data/test162 index e02952be5..d30804ac5 100644 --- 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 -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 @@ -35,10 +35,10 @@ http://%HOSTIP:%HOSTPORT/162 --proxy http://%HOSTIP:%HOSTPORT --proxy-user foo:b ^User-Agent: curl/.* -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: */* diff --git a/tests/data/test163 b/tests/data/test163 index fefe8448b..6712e24ea 100644 --- a/tests/data/test163 +++ b/tests/data/test163 @@ -18,7 +18,7 @@ http HTTP multipart formpost with contents from a file -http://%HOSTIP:%HOSTPORT/we/want/163 -F "name= # We create this file before the command is invoked! @@ -42,7 +42,7 @@ yes please 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 diff --git a/tests/data/test164 b/tests/data/test164 index f944bdb8d..366ea4157 100644 --- a/tests/data/test164 +++ b/tests/data/test164 @@ -39,7 +39,7 @@ http HTTP range with multiple ranges -http://%HOSTIP:%HOSTPORT/want/164 -r 0-10,12-15 +http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15 @@ -51,7 +51,7 @@ http://%HOSTIP:%HOSTPORT/want/164 -r 0-10,12-15 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: */* diff --git a/tests/data/test165 b/tests/data/test165 index 9d6ce9dbe..0475b6903 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -27,7 +27,7 @@ CHARSET=ISO8859-1 HTTP over proxy with IDN host name -http://www.åäö.se/page/165 -x %HOSTIP:%HOSTPORT +http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test166 b/tests/data/test166 index fada82ba7..07a0675ef 100644 --- a/tests/data/test166 +++ b/tests/data/test166 @@ -18,7 +18,7 @@ http HTTP formpost a file with spaces in name -http://%HOSTIP:%HOSTPORT/we/want/166 -F "name=@log/fie ld 166" +http://%HOSTIP:%HTTPPORT/we/want/166 -F "name=@log/fie ld 166" # We create this file before the command is invoked! @@ -34,7 +34,7 @@ data inside the file 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 diff --git a/tests/data/test167 b/tests/data/test167 index 5dda8770a..4e57fab4a 100644 --- a/tests/data/test167 +++ b/tests/data/test167 @@ -33,7 +33,7 @@ http HTTP with proxy-requiring-Basic to site-requiring-Digest -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 diff --git a/tests/data/test168 b/tests/data/test168 index 306a8b2a3..b740a3536 100644 --- a/tests/data/test168 +++ b/tests/data/test168 @@ -47,7 +47,7 @@ http HTTP with proxy-requiring-Digest to site-requiring-Digest -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 diff --git a/tests/data/test169 b/tests/data/test169 index ddd8e4ce3..f0c0ccea7 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -72,7 +72,7 @@ SSL HTTP with proxy-requiring-NTLM to site-requiring-Digest -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 diff --git a/tests/data/test17 b/tests/data/test17 index 5b1390eef..de0e2d303 100644 --- a/tests/data/test17 +++ b/tests/data/test17 @@ -29,7 +29,7 @@ request MOOO --max-time 180 --K - %HOSTIP:%HOSTPORT/that.site.com/17 +-K - %HOSTIP:%HTTPPORT/that.site.com/17 @@ -38,7 +38,7 @@ request MOOO 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: */* diff --git a/tests/data/test170 b/tests/data/test170 index cd6054145..659f693db 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -14,7 +14,7 @@ SSL HTTP POST with --proxy-ntlm and no SSL with no response -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" diff --git a/tests/data/test171 b/tests/data/test171 index e8e493ad7..26bbf2e7f 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -21,7 +21,7 @@ http HTTP, get cookie with dot prefixed full domain --c log/jar171 -x %HOSTIP:%HOSTPORT http://z.x.com/171 +-c log/jar171 -x %HOSTIP:%HTTPPORT http://z.x.com/171 diff --git a/tests/data/test172 b/tests/data/test172 index ff1cb7abe..513e44cd2 100644 --- a/tests/data/test172 +++ b/tests/data/test172 @@ -18,7 +18,7 @@ http HTTP with cookies file and custom added cookie -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" # Netscape HTTP Cookie File @@ -38,7 +38,7 @@ http://%HOSTIP:%HOSTPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool" 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 diff --git a/tests/data/test173 b/tests/data/test173 index f2372bda9..8d668dd35 100644 --- a/tests/data/test173 +++ b/tests/data/test173 @@ -19,7 +19,7 @@ http HTTP RFC1867-formpost a file from stdin with "faked" filename -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" @@ -42,7 +42,7 @@ line8 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 diff --git a/tests/data/test174 b/tests/data/test174 index b5782be69..363a4899e 100644 --- a/tests/data/test174 +++ b/tests/data/test174 @@ -42,7 +42,7 @@ http HTTP POST --anyauth to server not requiring any auth at all -http://%HOSTIP:%HOSTPORT/174 -u testuser:testpass --anyauth -d "junkelijunk" +http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk" @@ -54,13 +54,13 @@ http://%HOSTIP:%HOSTPORT/174 -u testuser:testpass --anyauth -d "junkelijunk" 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 diff --git a/tests/data/test175 b/tests/data/test175 index a8c648d16..57496cd83 100644 --- a/tests/data/test175 +++ b/tests/data/test175 @@ -42,7 +42,7 @@ http HTTP POST --digest to server not requiring any auth at all -http://%HOSTIP:%HOSTPORT/175 -u auser:apasswd --digest -d "junkelijunk" +http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk" @@ -54,13 +54,13 @@ http://%HOSTIP:%HOSTPORT/175 -u auser:apasswd --digest -d "junkelijunk" 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 diff --git a/tests/data/test176 b/tests/data/test176 index a270110f7..387a68959 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -46,7 +46,7 @@ http HTTP POST --ntlm to server not requiring any auth at all -http://%HOSTIP:%HOSTPORT/176 -u auser:apasswd --ntlm -d "junkelijunk" +http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk" @@ -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 diff --git a/tests/data/test177 b/tests/data/test177 index e8c0324dc..8543ab694 100644 --- a/tests/data/test177 +++ b/tests/data/test177 @@ -19,7 +19,7 @@ http HTTP POST --digest to server doing a 302-location response -http://%HOSTIP:%HOSTPORT/177 -u auser:apasswd --digest -d "junkelijunk" +http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk" @@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/177 -u auser:apasswd --digest -d "junkelijunk" 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: */* diff --git a/tests/data/test178 b/tests/data/test178 index 7d5403d56..45bb9a2e7 100644 --- a/tests/data/test178 +++ b/tests/data/test178 @@ -22,7 +22,7 @@ http simple HTTP GET with negative Content-Length -http://%HOSTIP:%HOSTPORT/178 +http://%HOSTIP:%HTTPPORT/178 @@ -34,7 +34,7 @@ http://%HOSTIP:%HOSTPORT/178 GET /178 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test179 b/tests/data/test179 index d63226263..edef6bbd5 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -21,7 +21,7 @@ http HTTP using proxy and cookies with path checks -http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HOSTPORT +http://supertrooper.fake/c/179 -b log/injar179 -x %HOSTIP:%HTTPPORT supertrooper.fake FALSE /a FALSE 2139150993 mooo indeed diff --git a/tests/data/test18 b/tests/data/test18 index 67a8361f5..38519b46d 100644 --- a/tests/data/test18 +++ b/tests/data/test18 @@ -32,7 +32,7 @@ http multiple requests using {} in URL -'%HOSTIP:%HOSTPORT/{18,180002,180003}' +'%HOSTIP:%HTTPPORT/{18,180002,180003}' @@ -44,37 +44,37 @@ multiple requests using {} in URL 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: */* ---_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 diff --git a/tests/data/test180 b/tests/data/test180 index ac4be829f..d76d63779 100644 --- a/tests/data/test180 +++ b/tests/data/test180 @@ -18,7 +18,7 @@ http HTTP 1.0 PUT -http://%HOSTIP:%HOSTPORT/we/want/180 -T log/test180.txt --http1.0 +http://%HOSTIP:%HTTPPORT/we/want/180 -T log/test180.txt --http1.0 Weird @@ -40,7 +40,7 @@ the 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 diff --git a/tests/data/test181 b/tests/data/test181 index db7d92dc8..15d9d2a8d 100644 --- a/tests/data/test181 +++ b/tests/data/test181 @@ -18,7 +18,7 @@ http HTTP 1.0 POST -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 Weird @@ -40,7 +40,7 @@ the 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 diff --git a/tests/data/test183 b/tests/data/test183 index 6a9e9ba92..1278e418d 100644 --- a/tests/data/test183 +++ b/tests/data/test183 @@ -21,7 +21,7 @@ SSL HTTP GET two URLs over a single proxy with persistent connection -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 diff --git a/tests/data/test2 b/tests/data/test2 index a7c231a49..5b7e85052 100644 --- a/tests/data/test2 +++ b/tests/data/test2 @@ -21,7 +21,7 @@ http HTTP GET with user and password - -u fake:user http://%HOSTIP:%HOSTPORT/2 + -u fake:user http://%HOSTIP:%HTTPPORT/2 @@ -34,7 +34,7 @@ HTTP GET with user and password GET /2 HTTP/1.1 Authorization: Basic ZmFrZTp1c2Vy -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test22 b/tests/data/test22 index 32ed119ab..3e0f21fde 100644 --- a/tests/data/test22 +++ b/tests/data/test22 @@ -18,7 +18,7 @@ http get HTTP with URL > 10000 bytes -%HOSTIP:%HOSTPORT/`perl -e 'print "a" x 10000;'`/22 +%HOSTIP:%HTTPPORT/`perl -e 'print "a" x 10000;'`/22 @@ -30,7 +30,7 @@ get HTTP with URL > 10000 bytes GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1 User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6) -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test23 b/tests/data/test23 index dfd0967f8..f3d860b68 100644 --- a/tests/data/test23 +++ b/tests/data/test23 @@ -13,7 +13,7 @@ http unsupported protocol:// URL -htfp://%HOSTIP:%HOSTPORT/none.htfml +htfp://%HOSTIP:%HTTPPORT/none.htfml diff --git a/tests/data/test24 b/tests/data/test24 index 99d055fc2..b530a234d 100644 --- a/tests/data/test24 +++ b/tests/data/test24 @@ -17,7 +17,7 @@ http HTTP GET fail silently on HTTP error return -http://%HOSTIP:%HOSTPORT/24 --fail +http://%HOSTIP:%HTTPPORT/24 --fail @@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/24 --fail 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: */* diff --git a/tests/data/test25 b/tests/data/test25 index 13ad5a4e8..6cf5dc2bd 100644 --- a/tests/data/test25 +++ b/tests/data/test25 @@ -58,7 +58,7 @@ http looping HTTP Location: following with --max-redirs, no persistance -http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5 +http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5 @@ -70,37 +70,37 @@ http://%HOSTIP:%HOSTPORT/want/25 -L --max-redirs 5 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: */* diff --git a/tests/data/test26 b/tests/data/test26 index be4f6a960..818b2208a 100644 --- a/tests/data/test26 +++ b/tests/data/test26 @@ -18,7 +18,7 @@ http specify more -o than URLs -http://%HOSTIP:%HOSTPORT/want/26 -o - -o - +http://%HOSTIP:%HTTPPORT/want/26 -o - -o - @@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/want/26 -o - -o - 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: */* diff --git a/tests/data/test27 b/tests/data/test27 index 2e74e5314..891b15876 100644 --- a/tests/data/test27 +++ b/tests/data/test27 @@ -18,7 +18,7 @@ http Get same cookie page several times -'http://%HOSTIP:%HOSTPORT/want/{27,27,27}' -b none +'http://%HOSTIP:%HTTPPORT/want/{27,27,27}' -b none @@ -29,18 +29,18 @@ Get same cookie page several times 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 diff --git a/tests/data/test28 b/tests/data/test28 index 183bd6132..9f2923513 100644 --- a/tests/data/test28 +++ b/tests/data/test28 @@ -43,7 +43,7 @@ http HTTP Location: following with extra spaces in header -http://%HOSTIP:%HOSTPORT/want/28 -L +http://%HOSTIP:%HTTPPORT/want/28 -L @@ -54,12 +54,12 @@ http://%HOSTIP:%HOSTPORT/want/28 -L 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: */* diff --git a/tests/data/test29 b/tests/data/test29 index 6f93cfb6e..f5b71436c 100644 --- a/tests/data/test29 +++ b/tests/data/test29 @@ -21,7 +21,7 @@ http HTTP with 2 secs timeout -http://%HOSTIP:%HOSTPORT/want/29 -m 2 +http://%HOSTIP:%HTTPPORT/want/29 -m 2 @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/want/29 -m 2 GET /want/29 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test3 b/tests/data/test3 index 36ccad156..d0413bf06 100644 --- 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 - -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 @@ -41,7 +41,7 @@ HTTP POST with auth and contents but with content-length set to 0 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 diff --git a/tests/data/test30 b/tests/data/test30 index 1fc0ae68e..6fa623e92 100644 --- a/tests/data/test30 +++ b/tests/data/test30 @@ -13,7 +13,7 @@ http HTTP with no data in server reply -http://%HOSTIP:%HOSTPORT/want/30 +http://%HOSTIP:%HTTPPORT/want/30 @@ -24,7 +24,7 @@ http://%HOSTIP:%HOSTPORT/want/30 GET /want/30 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test300 b/tests/data/test300 index deb957b06..6ec21c2bd 100644 --- a/tests/data/test300 +++ b/tests/data/test300 @@ -33,7 +33,7 @@ simple HTTPS GET GET /300 HTTP/1.1 -Host: 127.0.0.1:8433 +Host: 127.0.0.1:%HTTPSPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test301 b/tests/data/test301 index 7160b31b9..58c46ecb6 100644 --- a/tests/data/test301 +++ b/tests/data/test301 @@ -34,7 +34,7 @@ HTTPS GET with user and password GET /301 HTTP/1.1 Authorization: Basic ZmFrZTp1c2Vy -Host: 127.0.0.1:8433 +Host: 127.0.0.1:%HTTPSPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test302 b/tests/data/test302 index 70f5791d4..e8d0413e6 100644 --- a/tests/data/test302 +++ b/tests/data/test302 @@ -14,7 +14,7 @@ https HTTPS GET over HTTP proxy fails --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 diff --git a/tests/data/test303 b/tests/data/test303 index af3e125ef..b2654a612 100644 --- a/tests/data/test303 +++ b/tests/data/test303 @@ -21,7 +21,7 @@ https HTTPS with 2 secs timeout -http://%HOSTIP:%HOSTPORT/want/303 -m 2 +http://%HOSTIP:%HTTPPORT/want/303 -m 2 @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/want/303 -m 2 GET /want/303 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test304 b/tests/data/test304 index b798f6b5e..75751c2c0 100644 --- a/tests/data/test304 +++ b/tests/data/test304 @@ -35,7 +35,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 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 diff --git a/tests/data/test305 b/tests/data/test305 index 92d9d67d7..99e5400c8 100644 --- a/tests/data/test305 +++ b/tests/data/test305 @@ -13,7 +13,7 @@ https insecure HTTPS without permission -https://%HOSTIP:%HOSTPORT/want/305 --cacert moooo +https://%HOSTIP:%HTTPPORT/want/305 --cacert moooo diff --git a/tests/data/test306 b/tests/data/test306 index f68d28eba..646eee4d2 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -46,7 +46,7 @@ HTTPS GET, receive no headers only data! GET /306 HTTP/1.1 -Host: 127.0.0.1:8433 +Host: 127.0.0.1:%HTTPSPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test31 b/tests/data/test31 index 26df799c7..692b12d84 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -31,7 +31,7 @@ http HTTP with weirdly formatted cookies and cookiejar storage -http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt +http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt @@ -42,7 +42,7 @@ http://%HOSTIP:%HOSTPORT/we/want/31 -b none -c log/jar31.txt GET /we/want/31 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test32 b/tests/data/test32 index fc84a5ca8..956a1e4ff 100644 --- a/tests/data/test32 +++ b/tests/data/test32 @@ -27,7 +27,7 @@ http HTTP with -d and -G --d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/32 -G +-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/32 -G @@ -40,7 +40,7 @@ HTTP with -d and -G 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: */* diff --git a/tests/data/test33 b/tests/data/test33 index ed758e9a8..bc8c9d93b 100644 --- a/tests/data/test33 +++ b/tests/data/test33 @@ -27,7 +27,7 @@ HTTP PUT with resume 012345678 -http://%HOSTIP:%HOSTPORT/33 -Tlog/test33.txt -C 50 +http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50 @@ -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 diff --git a/tests/data/test34 b/tests/data/test34 index f22ec475f..4d646cdd2 100644 --- a/tests/data/test34 +++ b/tests/data/test34 @@ -37,7 +37,7 @@ http HTTP GET with chunked Transfer-Encoding -http://%HOSTIP:%HOSTPORT/34 +http://%HOSTIP:%HTTPPORT/34 @@ -49,7 +49,7 @@ http://%HOSTIP:%HOSTPORT/34 GET /34 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test36 b/tests/data/test36 index 60bbf3feb..406b9218f 100644 --- a/tests/data/test36 +++ b/tests/data/test36 @@ -33,7 +33,7 @@ http HTTP GET with bad chunked Transfer-Encoding -http://%HOSTIP:%HOSTPORT/36 +http://%HOSTIP:%HTTPPORT/36 @@ -48,7 +48,7 @@ http://%HOSTIP:%HOSTPORT/36 GET /36 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test37 b/tests/data/test37 index 1705cb03c..889d6aacb 100644 --- a/tests/data/test37 +++ b/tests/data/test37 @@ -15,7 +15,7 @@ http HTTP GET with nothing returned from server -http://%HOSTIP:%HOSTPORT/37 +http://%HOSTIP:%HTTPPORT/37 @@ -30,7 +30,7 @@ http://%HOSTIP:%HOSTPORT/37 GET /37 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test38 b/tests/data/test38 index 49df17ea5..2b97f9621 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -19,7 +19,7 @@ http HTTP resume request without server supporting it -http://%HOSTIP:%HOSTPORT/want/38 -C - -i -o log/fewl.txt +http://%HOSTIP:%HTTPPORT/want/38 -C - -i -o log/fewl.txt This text is here to simulate a partly downloaded file to resume @@ -38,7 +38,7 @@ download on. 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: */* diff --git a/tests/data/test39 b/tests/data/test39 index 53aa9550a..96b4661a2 100644 --- a/tests/data/test39 +++ b/tests/data/test39 @@ -19,7 +19,7 @@ http HTTP RFC1867-type formposting with filename= and type= -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 # We create this file before the command is invoked! @@ -38,7 +38,7 @@ foo 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 diff --git a/tests/data/test4 b/tests/data/test4 index 2c84c7940..37b081f1c 100644 --- a/tests/data/test4 +++ b/tests/data/test4 @@ -21,7 +21,7 @@ http Replaced internal and added custom HTTP headers - -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HOSTPORT/4 + -H "extra-header: here" -H "Accept: replaced" http://%HOSTIP:%HTTPPORT/4 @@ -33,7 +33,7 @@ Replaced internal and added custom HTTP headers 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 diff --git a/tests/data/test40 b/tests/data/test40 index ca0e2fb86..70ea57aad 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -41,7 +41,7 @@ http HTTP redirect with whitespace after ? (and conversion) -http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/40 -L 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: */* diff --git a/tests/data/test41 b/tests/data/test41 index e29324eb2..d8cb36da6 100644 --- a/tests/data/test41 +++ b/tests/data/test41 @@ -11,7 +11,7 @@ http HTTP formpost with missing file -http://%HOSTIP:%HOSTPORT/want/41 -F moo=@boo +http://%HOSTIP:%HTTPPORT/want/41 -F moo=@boo diff --git a/tests/data/test42 b/tests/data/test42 index b179e8a34..c71d088f8 100644 --- a/tests/data/test42 +++ b/tests/data/test42 @@ -41,7 +41,7 @@ http HTTP redirect with whitespace in path (and conversion) -http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/42 -L 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: */* diff --git a/tests/data/test43 b/tests/data/test43 index 22719d86b..d03772fce 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -43,7 +43,7 @@ http HTTP Location: following over HTTP proxy -http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT +http://%HOSTIP:%HTTPPORT/want/43 -L -x %HOSTIP:%HTTPPORT @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/want/43 -L -x %HOSTIP:%HOSTPORT ^User-Agent:.* -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: */* diff --git a/tests/data/test44 b/tests/data/test44 index 9b5ec8b8b..dfd50250d 100644 --- a/tests/data/test44 +++ b/tests/data/test44 @@ -19,7 +19,7 @@ http HTTP RFC1867-type formposting without Expect: header -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:' # We create this file before the command is invoked! @@ -37,7 +37,7 @@ bar 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 diff --git a/tests/data/test45 b/tests/data/test45 index 3019d5c9c..30a1fea8a 100644 --- a/tests/data/test45 +++ b/tests/data/test45 @@ -43,7 +43,7 @@ http simple HTTP Location: without protocol in initial URL -%HOSTIP:%HOSTPORT/want/45 -L +%HOSTIP:%HTTPPORT/want/45 -L @@ -54,12 +54,12 @@ simple HTTP Location: without protocol in initial URL 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: */* diff --git a/tests/data/test46 b/tests/data/test46 index bbdc55f53..a988d88fb 100644 --- a/tests/data/test46 +++ b/tests/data/test46 @@ -26,7 +26,7 @@ http HTTP, get cookies and store in cookie jar -%HOSTIP:%HOSTPORT/want/46 -c log/jar46 -b log/injar46 +%HOSTIP:%HTTPPORT/want/46 -c log/jar46 -b log/injar46 # Netscape HTTP Cookie File @@ -47,7 +47,7 @@ www.loser.com FALSE / FALSE 1139150993 UID 99 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 diff --git a/tests/data/test47 b/tests/data/test47 index d13d5f8f7..a3e53cd14 100644 --- a/tests/data/test47 +++ b/tests/data/test47 @@ -20,7 +20,7 @@ http simple HTTP 1.0 GET -http://%HOSTIP:%HOSTPORT/47 -0 +http://%HOSTIP:%HTTPPORT/47 -0 @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT/47 -0 GET /47 HTTP/1.0 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test48 b/tests/data/test48 index 8be76bb6e..1cd3c728a 100644 --- a/tests/data/test48 +++ b/tests/data/test48 @@ -19,7 +19,7 @@ http HTTP with -d and -G and -I --d "foo=moo&moo=poo" http://%HOSTIP:%HOSTPORT/48 -G -I +-d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/48 -G -I @@ -31,7 +31,7 @@ HTTP with -d and -G and -I 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: */* diff --git a/tests/data/test49 b/tests/data/test49 index c49c890ee..daf5be2d0 100644 --- a/tests/data/test49 +++ b/tests/data/test49 @@ -41,7 +41,7 @@ http HTTP follow redirect with ../ -http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/49 -L 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: */* diff --git a/tests/data/test5 b/tests/data/test5 index d8b49f183..2d2d76f7c 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -21,7 +21,7 @@ http HTTP over proxy -http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT +http://%HOSTIP:%HTTPPORT/we/want/that/page/5 -x %HOSTIP:%HTTPPORT @@ -32,8 +32,8 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/5 -x %HOSTIP:%HOSTPORT ^User-Agent:.* -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: */* diff --git a/tests/data/test50 b/tests/data/test50 index 000db4ac5..10e2dd839 100644 --- a/tests/data/test50 +++ b/tests/data/test50 @@ -41,7 +41,7 @@ http HTTP follow redirect with ../../ -http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/50 -L 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: */* diff --git a/tests/data/test500 b/tests/data/test500 index 52288c824..eb509c064 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -31,7 +31,7 @@ lib500 simple libcurl HTTP GET tool -http://%HOSTIP:%HOSTPORT/500 +http://%HOSTIP:%HTTPPORT/500 @@ -40,7 +40,7 @@ http://%HOSTIP:%HOSTPORT/500 GET /500 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test501 b/tests/data/test501 index c427adf87..3a0334b3b 100644 --- a/tests/data/test501 +++ b/tests/data/test501 @@ -17,7 +17,7 @@ lib501 simple libcurl attempt operation without URL set -http://%HOSTIP:%HOSTPORT/501 +http://%HOSTIP:%HTTPPORT/501 diff --git a/tests/data/test503 b/tests/data/test503 index 9f26e2927..b9f093f35 100644 --- a/tests/data/test503 +++ b/tests/data/test503 @@ -34,7 +34,7 @@ lib503 simple multi http:// through proxytunnel with authentication info -http://%HOSTIP:%HTTPSPORT/503 localhost:%HOSTPORT +http://%HOSTIP:%HTTPSPORT/503 localhost:%HTTPPORT foo @@ -48,12 +48,12 @@ moo # Verify data after the test has been "shot" -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: */* diff --git a/tests/data/test506 b/tests/data/test506 index 85a5bc9a0..4fbf5f81d 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -50,7 +50,7 @@ HTTP with shared cookie list (and dns cache) lib506 -http://%HOSTIP:%HOSTPORT/506 +http://%HOSTIP:%HTTPPORT/506 @@ -139,7 +139,7 @@ unlock: share : 55 GLOBAL_CLEANUP -http://%HOSTIP:%HOSTPORT/506 +http://%HOSTIP:%HTTPPORT/506 # Netscape HTTP Cookie File diff --git a/tests/data/test508 b/tests/data/test508 index 47822bec4..08217effb 100644 --- a/tests/data/test508 +++ b/tests/data/test508 @@ -26,7 +26,7 @@ lib508 send HTTP POST using read callback -http://%HOSTIP:%HOSTPORT/508 +http://%HOSTIP:%HTTPPORT/508 @@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/508 POST /508 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Content-Length: 45 diff --git a/tests/data/test509 b/tests/data/test509 index d4098e159..70ce7c183 100644 --- a/tests/data/test509 +++ b/tests/data/test509 @@ -4,7 +4,6 @@ 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 -https://localhost:%HTTPSPORT/dvcs +https://localhost:%HTTPSPORT/dvcs %HTTPSPORT @@ -43,7 +42,7 @@ https://localhost:%HTTPSPORT/dvcs GET /509 HTTP/1.1 -Host: localhost:8433 +Host: localhost:%HTTPSPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test51 b/tests/data/test51 index 3aa10a3f5..334f09ee0 100644 --- a/tests/data/test51 +++ b/tests/data/test51 @@ -41,7 +41,7 @@ http HTTP follow redirect with exessive ../ -http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/51 -L 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: */* diff --git a/tests/data/test510 b/tests/data/test510 index 33790dc79..e1885c019 100644 --- a/tests/data/test510 +++ b/tests/data/test510 @@ -26,7 +26,7 @@ lib510 send HTTP POST using read callback, using chunked transfer-encoding -http://%HOSTIP:%HOSTPORT/510 +http://%HOSTIP:%HTTPPORT/510 @@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/510 POST /510 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Transfer-Encoding: chunked diff --git a/tests/data/test512 b/tests/data/test512 index 095c828e6..bd7f6fa6f 100644 --- a/tests/data/test512 +++ b/tests/data/test512 @@ -25,7 +25,7 @@ lib512 simple curl_easy_duplicate() test -http://%HOSTIP:%HOSTPORT/512 +http://%HOSTIP:%HTTPPORT/512 @@ -37,7 +37,7 @@ http://%HOSTIP:%HOSTPORT/512 GET /512 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test513 b/tests/data/test513 index b19ecd762..d97607e58 100644 --- a/tests/data/test513 +++ b/tests/data/test513 @@ -17,7 +17,7 @@ lib513 send HTTP POST using read callback that returns CURL_READFUNC_ABORT -http://%HOSTIP:%HOSTPORT/513 +http://%HOSTIP:%HTTPPORT/513 @@ -26,7 +26,7 @@ http://%HOSTIP:%HOSTPORT/513 POST /513 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Content-Length: 1 diff --git a/tests/data/test514 b/tests/data/test514 index 06fc66818..1b6e5e686 100644 --- a/tests/data/test514 +++ b/tests/data/test514 @@ -29,7 +29,7 @@ lib514 First set options to POST and then to make HEAD -http://%HOSTIP:%HOSTPORT/514 +http://%HOSTIP:%HTTPPORT/514 @@ -41,7 +41,7 @@ http://%HOSTIP:%HOSTPORT/514 HEAD /514 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test52 b/tests/data/test52 index 4f49059d6..e84b26474 100644 --- a/tests/data/test52 +++ b/tests/data/test52 @@ -41,7 +41,7 @@ http HTTP follow redirect with ./-prefix -http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L +http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L @@ -53,13 +53,13 @@ http://%HOSTIP:%HOSTPORT/we/are/all/twits/52 -L 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: */* diff --git a/tests/data/test53 b/tests/data/test53 index 9e1d6b635..43c44e9d9 100644 --- a/tests/data/test53 +++ b/tests/data/test53 @@ -21,7 +21,7 @@ http HTTP, junk session cookies -%HOSTIP:%HOSTPORT/want/53 -b log/injar53 -j +%HOSTIP:%HTTPPORT/want/53 -b log/injar53 -j 127.0.0.1 FALSE / FALSE 2139150993 mooo indeed @@ -37,7 +37,7 @@ HTTP, junk session cookies 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 diff --git a/tests/data/test54 b/tests/data/test54 index c71aa2b39..076311d74 100644 --- a/tests/data/test54 +++ b/tests/data/test54 @@ -18,7 +18,7 @@ http HTTP with blank Location: -http://%HOSTIP:%HOSTPORT/want/54 -L +http://%HOSTIP:%HTTPPORT/want/54 -L @@ -29,7 +29,7 @@ http://%HOSTIP:%HOSTPORT/want/54 -L GET /want/54 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test55 b/tests/data/test55 index fd7ca55ad..b8be8b9d8 100644 --- a/tests/data/test55 +++ b/tests/data/test55 @@ -35,7 +35,7 @@ http HTTP follow redirect with single slash in path -http://%HOSTIP:%HOSTPORT/55 -L +http://%HOSTIP:%HTTPPORT/55 -L @@ -45,13 +45,13 @@ http://%HOSTIP:%HOSTPORT/55 -L 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: */* diff --git a/tests/data/test56 b/tests/data/test56 index c1d2489bc..098e1e10a 100644 --- a/tests/data/test56 +++ b/tests/data/test56 @@ -28,7 +28,7 @@ header "Transfer-Encoding: chunked" # --K - %HOSTIP:%HOSTPORT/that.site.com/56 +-K - %HOSTIP:%HTTPPORT/that.site.com/56 @@ -39,7 +39,7 @@ header "Transfer-Encoding: chunked" 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 diff --git a/tests/data/test57 b/tests/data/test57 index b3fb332db..edca9c8c9 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -17,7 +17,7 @@ http HTTP content-type with spaces in --w '%{content_type}\n' %HOSTIP:%HOSTPORT/57 -o log/out57 +-w '%{content_type}\n' %HOSTIP:%HTTPPORT/57 -o log/out57 @@ -31,7 +31,7 @@ text/html; charset=ISO-8859-4 GET /57 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test58 b/tests/data/test58 index 0ff07c34e..686811575 100644 --- a/tests/data/test58 +++ b/tests/data/test58 @@ -19,7 +19,7 @@ http HTTP PUT from file with weird letters -http://%HOSTIP:%HOSTPORT/we/want/ -T log/58te[]st.txt -g +http://%HOSTIP:%HTTPPORT/we/want/ -T log/58te[]st.txt -g a few bytes @@ -33,7 +33,7 @@ a few bytes 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 diff --git a/tests/data/test59 b/tests/data/test59 index 7e7691d71..3da70c2f5 100644 --- a/tests/data/test59 +++ b/tests/data/test59 @@ -20,7 +20,7 @@ http HTTP URL with slash but with "parameter" -http://%HOSTIP:%HOSTPORT?mooo/59 +http://%HOSTIP:%HTTPPORT?mooo/59 @@ -32,7 +32,7 @@ http://%HOSTIP:%HOSTPORT?mooo/59 GET /?mooo/59 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test6 b/tests/data/test6 index 9a0d02cc3..910d41fcf 100644 --- a/tests/data/test6 +++ b/tests/data/test6 @@ -20,7 +20,7 @@ http HTTP with simple cookie send -http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2" +http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2" @@ -31,7 +31,7 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2" GET /we/want/that/page/6 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Cookie: name=contents;name2=content2 diff --git a/tests/data/test60 b/tests/data/test60 index fc358c15a..c95c0e494 100644 --- a/tests/data/test60 +++ b/tests/data/test60 @@ -19,7 +19,7 @@ http HTTP PUT from stdin with wrong content-length -http://%HOSTIP:%HOSTPORT/bzz/60 -T - -H "Content-Length: 1" < log/60.txt +http://%HOSTIP:%HTTPPORT/bzz/60 -T - -H "Content-Length: 1" < log/60.txt more than one byte @@ -33,7 +33,7 @@ more than one byte PUT /bzz/60 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Transfer-Encoding: chunked diff --git a/tests/data/test61 b/tests/data/test61 index e5f70754a..3fbed6a8a 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -26,7 +26,7 @@ http HTTP with various cookies and custom Host: -http://%HOSTIP:%HOSTPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com" +http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com" diff --git a/tests/data/test62 b/tests/data/test62 index 00309ea1b..416f8e580 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -18,7 +18,7 @@ http HTTP, send cookies when using custom Host: -http://%HOSTIP:%HOSTPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com" +http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com" # Netscape HTTP Cookie File diff --git a/tests/data/test63 b/tests/data/test63 index ecca6b256..1ac0591ad 100644 --- a/tests/data/test63 +++ b/tests/data/test63 @@ -18,7 +18,7 @@ http HTTP with proxy authorization set in environment -http_proxy=http://fake:user@%HOSTIP:%HOSTPORT/ +http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/ http://we.want.that.site.com/63 diff --git a/tests/data/test64 b/tests/data/test64 index 26c31d7c2..945514cb6 100644 --- a/tests/data/test64 +++ b/tests/data/test64 @@ -43,7 +43,7 @@ http HTTP with Digest authorization -http://%HOSTIP:%HOSTPORT/64 -u testuser:testpass --digest +http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest @@ -54,14 +54,14 @@ http://%HOSTIP:%HOSTPORT/64 -u testuser:testpass --digest GET /64 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /64 HTTP/1.1 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca" 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: */* diff --git a/tests/data/test65 b/tests/data/test65 index e734c275b..b32e77786 100644 --- a/tests/data/test65 +++ b/tests/data/test65 @@ -47,7 +47,7 @@ http HTTP with Digest authorization with bad password -http://%HOSTIP:%HOSTPORT/65 -u testuser:test2pass --digest +http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest @@ -58,14 +58,14 @@ http://%HOSTIP:%HOSTPORT/65 -u testuser:test2pass --digest GET /65 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /65 HTTP/1.1 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b" 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: */* diff --git a/tests/data/test66 b/tests/data/test66 index 285c0c42e..95d158183 100644 --- a/tests/data/test66 +++ b/tests/data/test66 @@ -14,7 +14,7 @@ http HTTP GET without headers in the response -http://%HOSTIP:%HOSTPORT/66 +http://%HOSTIP:%HTTPPORT/66 @@ -26,7 +26,7 @@ http://%HOSTIP:%HOSTPORT/66 GET /66 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test67 b/tests/data/test67 index 16ea8d841..e2fd51cf2 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -54,7 +54,7 @@ http HTTP with NTLM authorization -http://%HOSTIP:%HOSTPORT/67 -u testuser:testpass --ntlm +http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm @@ -67,14 +67,14 @@ http://%HOSTIP:%HOSTPORT/67 -u testuser:testpass --ntlm GET /67 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 /67 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: */* diff --git a/tests/data/test68 b/tests/data/test68 index 98787788a..c4f4eec39 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -56,7 +56,7 @@ http HTTP with NTLM authorization and wrong password -http://%HOSTIP:%HOSTPORT/68 -u testuser:testpass --ntlm +http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm @@ -69,14 +69,14 @@ http://%HOSTIP:%HOSTPORT/68 -u testuser:testpass --ntlm GET /68 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 /68 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: */* diff --git a/tests/data/test69 b/tests/data/test69 index e628f72ca..5fe3625e1 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -69,7 +69,7 @@ http HTTP with NTLM, Basic or Wild-and-crazy authorization -http://%HOSTIP:%HOSTPORT/69 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth @@ -81,21 +81,21 @@ http://%HOSTIP:%HOSTPORT/69 -u testuser:testpass --anyauth GET /69 HTTP/1.1 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 /69 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 /69 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: */* diff --git a/tests/data/test7 b/tests/data/test7 index 7441d3128..ad526e132 100644 --- a/tests/data/test7 +++ b/tests/data/test7 @@ -22,7 +22,7 @@ http HTTP with cookie parser and header recording -http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt +http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt @@ -33,7 +33,7 @@ http://%HOSTIP:%HOSTPORT/we/want/7 -b none -D log/heads7.txt GET /we/want/7 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test70 b/tests/data/test70 index a9efd437b..1b73d948f 100644 --- a/tests/data/test70 +++ b/tests/data/test70 @@ -53,7 +53,7 @@ http HTTP with Digest *OR* NTLM authorization -http://%HOSTIP:%HOSTPORT/70 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth @@ -65,14 +65,14 @@ http://%HOSTIP:%HOSTPORT/70 -u testuser:testpass --anyauth GET /70 HTTP/1.1 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 /70 HTTP/1.1 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a" 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: */* diff --git a/tests/data/test71 b/tests/data/test71 index 826585dd8..5619d5e88 100644 --- a/tests/data/test71 +++ b/tests/data/test71 @@ -24,7 +24,7 @@ HTTP and -F upload in config file -F file=@log/test71.txt -http://%HOSTIP:%HOSTPORT/we/want/71 -K - +http://%HOSTIP:%HTTPPORT/we/want/71 -K - # We create this file before the command is invoked! @@ -42,7 +42,7 @@ bar POST /we/want/71 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 diff --git a/tests/data/test72 b/tests/data/test72 index e5600a7dc..f480840d6 100644 --- a/tests/data/test72 +++ b/tests/data/test72 @@ -49,7 +49,7 @@ http HTTP with Digest *OR* Basic authorization -http://%HOSTIP:%HOSTPORT/72 -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth @@ -61,14 +61,14 @@ http://%HOSTIP:%HOSTPORT/72 -u testuser:testpass --anyauth GET /72 HTTP/1.1 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 /72 HTTP/1.1 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd" 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: */* diff --git a/tests/data/test73 b/tests/data/test73 index 202375360..a475ed446 100644 --- a/tests/data/test73 +++ b/tests/data/test73 @@ -19,7 +19,7 @@ http HTTP, receive cookies when using custom Host:, domain using only two dots -http://%HOSTIP:%HOSTPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSED.se" +http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSED.se" diff --git a/tests/data/test74 b/tests/data/test74 index dc837d69e..3a444bb5b 100644 --- a/tests/data/test74 +++ b/tests/data/test74 @@ -34,7 +34,7 @@ http HTTP, urlglob {}-retrieval and -o #[num] usage -"http://%HOSTIP:%HOSTPORT/{74,740001}" -o "log/dumpit#1.dump" +"http://%HOSTIP:%HTTPPORT/{74,740001}" -o "log/dumpit#1.dump" @@ -46,12 +46,12 @@ HTTP, urlglob {}-retrieval and -o #[num] usage GET /74 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /740001 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test75 b/tests/data/test75 index bbd8cbc40..ff6a9f12f 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -13,7 +13,7 @@ none HTTP, urlglob retrieval with bad range -"http://%HOSTIP:%HOSTPORT/[1-1]" -o "log/weee#1.dump" --stderr - +"http://%HOSTIP:%HTTPPORT/[1-1]" -o "log/weee#1.dump" --stderr - diff --git a/tests/data/test76 b/tests/data/test76 index da43e2b06..72a621608 100644 --- a/tests/data/test76 +++ b/tests/data/test76 @@ -13,7 +13,7 @@ none HTTP, -O with no file name part in the URL -http://%HOSTIP:%HOSTPORT/76/ -O +http://%HOSTIP:%HTTPPORT/76/ -O diff --git a/tests/data/test77 b/tests/data/test77 index 61dba4059..4ba1220f0 100644 --- a/tests/data/test77 +++ b/tests/data/test77 @@ -26,7 +26,7 @@ http HTTP with -z "older date" -http://%HOSTIP:%HOSTPORT/77 -z "1999-12-12 12:00:00 MET" +http://%HOSTIP:%HTTPPORT/77 -z "1999-12-12 12:00:00 MET" @@ -38,7 +38,7 @@ http://%HOSTIP:%HOSTPORT/77 -z "1999-12-12 12:00:00 MET" GET /77 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT diff --git a/tests/data/test78 b/tests/data/test78 index a7a37d16c..156099a3a 100644 --- a/tests/data/test78 +++ b/tests/data/test78 @@ -38,7 +38,7 @@ http HTTP with -z "newer date" -http://%HOSTIP:%HOSTPORT/78 -z "1999-12-12 12:00:00 MET" +http://%HOSTIP:%HTTPPORT/78 -z "1999-12-12 12:00:00 MET" @@ -50,7 +50,7 @@ http://%HOSTIP:%HOSTPORT/78 -z "1999-12-12 12:00:00 MET" GET /78 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT diff --git a/tests/data/test79 b/tests/data/test79 index 5a9e12113..b13c1ed3b 100644 --- a/tests/data/test79 +++ b/tests/data/test79 @@ -22,7 +22,7 @@ http FTP over HTTP proxy -ftp://%HOSTIP:%HOSTPORT/we/want/that/page/79 -x %HOSTIP:%HOSTPORT +ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT @@ -33,8 +33,8 @@ ftp://%HOSTIP:%HOSTPORT/we/want/that/page/79 -x %HOSTIP:%HOSTPORT ^User-Agent:.* -GET ftp://127.0.0.1:8999/we/want/that/page/79 HTTP/1.1 -Host: 127.0.0.1:8999 +GET ftp://127.0.0.1:%HTTPPORT/we/want/that/page/79 HTTP/1.1 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test8 b/tests/data/test8 index bc1a99ca5..4ca750da7 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -17,7 +17,7 @@ http HTTP with cookie parsing from header file -http://%HOSTIP:%HOSTPORT/we/want/8 -b log/heads8.txt +http://%HOSTIP:%HTTPPORT/we/want/8 -b log/heads8.txt # We create this file before the command is invoked! @@ -41,7 +41,7 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/; GET /we/want/8 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Cookie: partmatch=present; foobar=name diff --git a/tests/data/test80 b/tests/data/test80 index dd4f0605c..12f68e39e 100644 --- a/tests/data/test80 +++ b/tests/data/test80 @@ -33,7 +33,7 @@ http HTTP CONNECT with proxy and host Basic authentication -http://%HOSTIP:%HOSTPORT/we/want/that/page/80 -p -x %HOSTIP:%HOSTPORT --user iam:myself --proxy-user youare:yourself +http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself @@ -44,14 +44,14 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/80 -p -x %HOSTIP:%HOSTPORT --user iam ^User-Agent:.* -CONNECT 127.0.0.1:8999 HTTP/1.0 +CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 GET /we/want/that/page/80 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test81 b/tests/data/test81 index 8e12bfa29..69379b72f 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -52,7 +52,7 @@ http HTTP with proxy using NTLM authorization -http://%HOSTIP:%HOSTPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HOSTPORT --proxy-ntlm +http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm @@ -62,17 +62,17 @@ http://%HOSTIP:%HOSTPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HO ^User-Agent:.* -GET http://127.0.0.1:8999/81 HTTP/1.1 +GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1 Proxy-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 http://127.0.0.1:8999/81 HTTP/1.1 +GET http://127.0.0.1:%HTTPPORT/81 HTTP/1.1 Proxy-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: */* diff --git a/tests/data/test82 b/tests/data/test82 index 7b49f89f2..12d10078c 100644 --- a/tests/data/test82 +++ b/tests/data/test82 @@ -24,7 +24,7 @@ http HTTP with proxy requiring NTLM, but we send Basic -http://%HOSTIP:%HOSTPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HOSTPORT +http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT @@ -34,10 +34,10 @@ http://%HOSTIP:%HOSTPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HO ^User-Agent:.* -GET http://127.0.0.1:8999/82 HTTP/1.1 +GET http://127.0.0.1:%HTTPPORT/82 HTTP/1.1 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M= 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: */* diff --git a/tests/data/test83 b/tests/data/test83 index 55d6a5a13..9a5f9f0ea 100644 --- a/tests/data/test83 +++ b/tests/data/test83 @@ -33,7 +33,7 @@ http HTTP over proxy-tunnel with site authentication -http://%HOSTIP:%HOSTPORT/we/want/that/page/83 -p -x %HOSTIP:%HOSTPORT --user iam:myself +http://%HOSTIP:%HTTPPORT/we/want/that/page/83 -p -x %HOSTIP:%HTTPPORT --user iam:myself @@ -44,13 +44,13 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/83 -p -x %HOSTIP:%HOSTPORT --user iam ^User-Agent:.* -CONNECT 127.0.0.1:8999 HTTP/1.0 +CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 GET /we/want/that/page/83 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test84 b/tests/data/test84 index 939de6f1b..89a6697a6 100644 --- a/tests/data/test84 +++ b/tests/data/test84 @@ -22,7 +22,7 @@ http HTTP over proxy with site authentication -http://%HOSTIP:%HOSTPORT/we/want/that/page/84 -x %HOSTIP:%HOSTPORT --user iam:myself +http://%HOSTIP:%HTTPPORT/we/want/that/page/84 -x %HOSTIP:%HTTPPORT --user iam:myself @@ -33,10 +33,10 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/84 -x %HOSTIP:%HOSTPORT --user iam:my ^User-Agent:.* -GET http://127.0.0.1:8999/we/want/that/page/84 HTTP/1.1 +GET http://127.0.0.1:%HTTPPORT/we/want/that/page/84 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test85 b/tests/data/test85 index b5c6e96de..399b3a2ef 100644 --- a/tests/data/test85 +++ b/tests/data/test85 @@ -22,7 +22,7 @@ http HTTP over proxy with site and proxy authentication -http://%HOSTIP:%HOSTPORT/we/want/that/page/85 -x %HOSTIP:%HOSTPORT --user iam:myself --proxy-user testing:this +http://%HOSTIP:%HTTPPORT/we/want/that/page/85 -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this @@ -33,11 +33,11 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/85 -x %HOSTIP:%HOSTPORT --user iam:my ^User-Agent:.* -GET http://127.0.0.1:8999/we/want/that/page/85 HTTP/1.1 +GET http://127.0.0.1:%HTTPPORT/we/want/that/page/85 HTTP/1.1 Proxy-Authorization: Basic dGVzdGluZzp0aGlz Authorization: Basic aWFtOm15c2VsZg== User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test86 b/tests/data/test86 index 7636ee890..c3356119a 100644 --- a/tests/data/test86 +++ b/tests/data/test86 @@ -48,7 +48,7 @@ http HTTP, urlglob []-retrieval and -o #[num] usage -"http://%HOSTIP:%HOSTPORT/[860001-860003]" -o "log/dumpit#1.dump" +"http://%HOSTIP:%HTTPPORT/[860001-860003]" -o "log/dumpit#1.dump" @@ -61,19 +61,19 @@ HTTP, urlglob []-retrieval and -o #[num] usage GET /860001 HTTP/1.1 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /860002 HTTP/1.1 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /860003 HTTP/1.1 User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test87 b/tests/data/test87 index 4673f4a2b..7e134b2d9 100644 --- a/tests/data/test87 +++ b/tests/data/test87 @@ -12,7 +12,7 @@ none urlglob with bad -o #[num] usage -"http://%HOSTIP:%HOSTPORT/[870001-870003]" -o "log/dumpit#2.dump" +"http://%HOSTIP:%HTTPPORT/[870001-870003]" -o "log/dumpit#2.dump" diff --git a/tests/data/test88 b/tests/data/test88 index 00f812c03..a07b3a3e1 100644 --- a/tests/data/test88 +++ b/tests/data/test88 @@ -50,7 +50,7 @@ http HTTP PUT with Digest authorization -http://%HOSTIP:%HOSTPORT/88 -T log/put88 -u testuser:testpass --digest +http://%HOSTIP:%HTTPPORT/88 -T log/put88 -u testuser:testpass --digest This is data we upload with PUT @@ -67,14 +67,14 @@ four is the number of lines HEAD /88 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* PUT /88 HTTP/1.1 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71" 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 diff --git a/tests/data/test89 b/tests/data/test89 index 543e01d75..5b5b3d27e 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -86,7 +86,7 @@ http HTTP with NTLM and follow-location -http://%HOSTIP:%HOSTPORT/89 -u testuser:testpass --ntlm -L +http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L @@ -99,28 +99,28 @@ http://%HOSTIP:%HOSTPORT/89 -u testuser:testpass --ntlm -L GET /89 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 /89 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: */* GET /you/890010 HTTP/1.1 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA= User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /you/890010 HTTP/1.1 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test9 b/tests/data/test9 index 9b26c525c..f94b24174 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -19,7 +19,7 @@ http HTTP RFC1867-type formposting -http://%HOSTIP:%HOSTPORT/we/want/9 -F name=daniel -F tool=curl -F file=@log/test9.txt +http://%HOSTIP:%HTTPPORT/we/want/9 -F name=daniel -F tool=curl -F file=@log/test9.txt # We create this file before the command is invoked! @@ -37,7 +37,7 @@ bar POST /we/want/9 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: 411 diff --git a/tests/data/test90 b/tests/data/test90 index 4afb8af5a..6c3475a06 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -120,7 +120,7 @@ http HTTP with NTLM via --anyauth, and then follow-location with NTLM again -http://%HOSTIP:%HOSTPORT/90 -u testuser:testpass --anyauth -L +http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L @@ -131,40 +131,40 @@ http://%HOSTIP:%HOSTPORT/90 -u testuser:testpass --anyauth -L GET /90 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /90 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 /90 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: */* GET /you/900010 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /you/900010 HTTP/1.1 Authorization: NTLM TlRMTVNTUAABAAAAAgIAAAAAAAAgAAAAAAAAACAAAAA= User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* GET /you/900010 HTTP/1.1 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEgAAAAYABgAYAAAAAAAAABAAAAACAAIAEAAAAAAAAAASAAAAAAAAAB4AAAAAYIAAHRlc3R1c2VyWmRDApEJkUyGOPS3DjvASModEeW/N/FBqYVyF4y6/y/7F6qmEQ7lXjXFF3tH1145 User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test91 b/tests/data/test91 index f3d5fcefd..f571e7c0d 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -72,7 +72,7 @@ http HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0 -http://%HOSTIP:%HOSTPORT/91 --anyauth -u mydomain\\myself:secret +http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret @@ -84,21 +84,21 @@ http://%HOSTIP:%HOSTPORT/91 --anyauth -u mydomain\\myself:secret GET /91 HTTP/1.1 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 /91 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 /91 HTTP/1.1 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE4AAAAYABgAZgAAAAgACABAAAAABgAGAEgAAAAAAAAATgAAAAAAAAB+AAAAAYIAAG15ZG9tYWlubXlzZWxmwjImlHmYemDYVmFrmRFoVn3jfoYDE+7QLmWXF7FJDlDNWSItJ+RylXJGAJdepH4C 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: */* diff --git a/tests/data/test92 b/tests/data/test92 index 1a1d30b38..070ead216 100644 --- a/tests/data/test92 +++ b/tests/data/test92 @@ -23,7 +23,7 @@ http HTTP resume transfer with the whole file already downloaded -http://%HOSTIP:%HOSTPORT/want/92 -C 87 +http://%HOSTIP:%HTTPPORT/want/92 -C 87 @@ -35,7 +35,7 @@ http://%HOSTIP:%HOSTPORT/want/92 -C 87 GET /want/92 HTTP/1.1 Range: bytes=87- -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test93 b/tests/data/test93 index ea458cec2..97d9a0f97 100644 --- a/tests/data/test93 +++ b/tests/data/test93 @@ -21,7 +21,7 @@ http HTTP GET with failed proxy auth -http://%HOSTIP:%HOSTPORT/93 -x %HOSTIP:%HOSTPORT +http://%HOSTIP:%HTTPPORT/93 -x %HOSTIP:%HTTPPORT @@ -32,8 +32,8 @@ http://%HOSTIP:%HOSTPORT/93 -x %HOSTIP:%HOSTPORT ^User-Agent:.* -GET http://127.0.0.1:8999/93 HTTP/1.1 -Host: 127.0.0.1:8999 +GET http://127.0.0.1:%HTTPPORT/93 HTTP/1.1 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/data/test94 b/tests/data/test94 index 90d7c06ff..8e942182f 100644 --- a/tests/data/test94 +++ b/tests/data/test94 @@ -24,7 +24,7 @@ SSL HTTPS GET with failed proxy auth -https://test.anything.really.com:94 -x %HOSTIP:%HOSTPORT +https://test.anything.really.com:94 -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test95 b/tests/data/test95 index 0602c33c6..fe5fdb820 100644 --- a/tests/data/test95 +++ b/tests/data/test95 @@ -33,7 +33,7 @@ http HTTP over proxytunnel using POST -http://%HOSTIP:%HOSTPORT/we/want/that/page/95 -p -x %HOSTIP:%HOSTPORT -d "datatopost=ohthatsfunyesyes" +http://%HOSTIP:%HTTPPORT/we/want/that/page/95 -p -x %HOSTIP:%HTTPPORT -d "datatopost=ohthatsfunyesyes" @@ -44,12 +44,12 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/95 -p -x %HOSTIP:%HOSTPORT -d "datato ^User-Agent:.* -CONNECT 127.0.0.1:8999 HTTP/1.0 +CONNECT 127.0.0.1:%HTTPPORT HTTP/1.0 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 POST /we/want/that/page/95 HTTP/1.1 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Content-Length: 27 diff --git a/tests/data/test97 b/tests/data/test97 index 170d64114..715ebf747 100644 --- a/tests/data/test97 +++ b/tests/data/test97 @@ -21,7 +21,7 @@ http HTTP POST with custom content-type - -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HOSTPORT/97 + -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/97 @@ -33,7 +33,7 @@ HTTP POST with custom content-type POST /97 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Content-Type: silly/type diff --git a/tests/data/test98 b/tests/data/test98 index 565b30d1d..aad64467d 100644 --- a/tests/data/test98 +++ b/tests/data/test98 @@ -21,7 +21,7 @@ http HTTP PUT from stdin with set size, disabling chunked transfer-encoding - -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HOSTPORT/98 + -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/98 data on stdin @@ -36,7 +36,7 @@ data on stdin PUT /98 HTTP/1.1 -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* Content-Length: 14 diff --git a/tests/data/test99 b/tests/data/test99 index 379e5a58a..a9d404ba8 100644 --- a/tests/data/test99 +++ b/tests/data/test99 @@ -24,7 +24,7 @@ http HTTP GET with large-file resume point and failed resume -http://%HOSTIP:%HOSTPORT/99 -C 9999999999 +http://%HOSTIP:%HTTPPORT/99 -C 9999999999 @@ -40,7 +40,7 @@ http://%HOSTIP:%HOSTPORT/99 -C 9999999999 GET /99 HTTP/1.1 Range: bytes=9999999999- -Host: 127.0.0.1:8999 +Host: 127.0.0.1:%HTTPPORT Pragma: no-cache Accept: */* diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c index eabddacee..9e535e9b6 100644 --- a/tests/libtest/lib509.c +++ b/tests/libtest/lib509.c @@ -18,6 +18,7 @@ #include #include +int portnum; /* the HTTPS port number we use */ typedef struct sslctxparm_st { CURL* curl; @@ -63,6 +64,8 @@ static unsigned char *my_get_ext(X509 * cert, const int type, void * globalparm = NULL; +char newurl[512]; + static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) { sslctxparm * p = (sslctxparm *) arg; @@ -113,7 +116,15 @@ static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) (char *)accessinfoURL, (char *)p->accessinfoURL); OPENSSL_free(p->accessinfoURL); p->accessinfoURL = accessinfoURL; - curl_easy_setopt(p->curl, CURLOPT_URL,p->accessinfoURL); + + /* We need to be able to deal with a custom port number, but the + URL in the cert uses a static one. We thus need to create a new + URL that uses the currently requested port number which may not + be the one this URL uses! */ + sprintf(newurl, "https://localhost:%d/509", portnum); + fprintf(stderr, "But *really* Setting URL <%s>\n", newurl); + + curl_easy_setopt(p->curl, CURLOPT_URL, newurl); } else OPENSSL_free(accessinfoURL); @@ -164,6 +175,10 @@ int test(char *URL) int i = 0; CURLMsg *msg; + if(arg2) { + portnum = atoi(arg2); + } + curl_global_init(CURL_GLOBAL_ALL); p.curl = curl_easy_init(); diff --git a/tests/runtests.pl b/tests/runtests.pl index 0f95b3f19..fbcd87c26 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -32,10 +32,14 @@ require "getpart.pm"; # array functions my $srcdir = $ENV{'srcdir'} || '.'; my $HOSTIP="127.0.0.1"; -my $HOSTPORT=8999; # bad name, but this is the HTTP server port -my $HTTPSPORT=8433; # this is the HTTPS server port -my $FTPPORT=8921; # this is the FTP server port -my $FTPSPORT=8821; # this is the FTPS server port + +my $base = 8990; # base port number + +my $HTTPPORT; # HTTP server port +my $HTTPSPORT; # HTTPS server port +my $FTPPORT; # FTP server port +my $FTPSPORT; # FTPS server port + my $CURL="../src/curl"; # what curl executable to run on the tests my $DBGCURL=$CURL; #"../src/.libs/curl"; # alternative for debugging my $LOGDIR="log"; @@ -325,7 +329,7 @@ sub runhttpserver { $pid = checkserver ($HTTPPIDFILE); # verify if our/any server is running on this port - my $cmd = "$CURL -o log/verifiedserver http://$HOSTIP:$HOSTPORT/verifiedserver 2>/dev/null"; + my $cmd = "$CURL -o log/verifiedserver http://$HOSTIP:$HTTPPORT/verifiedserver 2>/dev/null"; print "CMD; $cmd\n" if ($verbose); my $res = system($cmd); @@ -343,7 +347,7 @@ sub runhttpserver { $pid = 0+$1; } elsif($data || ($res != 7)) { - print "RUN: Unknown HTTP server is running on port $HOSTPORT\n"; + print "RUN: Unknown HTTP server is running on port $HTTPPORT\n"; return -2; } @@ -362,7 +366,7 @@ sub runhttpserver { if($dir) { $flag .= "-d \"$dir\" "; } - $cmd="$perl $srcdir/httpserver.pl $flag $HOSTPORT &"; + $cmd="$perl $srcdir/httpserver.pl $flag $HTTPPORT &"; system($cmd); if($verbose) { print "CMD: $cmd\n"; @@ -371,7 +375,7 @@ sub runhttpserver { my $verified; for(1 .. 10) { # verify that our server is up and running: - my $data=`$CURL --silent $HOSTIP:$HOSTPORT/verifiedserver 2>/dev/null`; + my $data=`$CURL --silent $HOSTIP:$HTTPPORT/verifiedserver 2>/dev/null`; if ( $data =~ /WE ROOLZ: (\d+)/ ) { $pid = 0+$1; @@ -421,7 +425,7 @@ sub runhttpsserver { } my $flag=$debugprotocol?"-v ":""; - my $cmd="$perl $srcdir/httpsserver.pl $flag -s \"$stunnel\" -d $srcdir -r $HOSTPORT $HTTPSPORT &"; + my $cmd="$perl $srcdir/httpsserver.pl $flag -s \"$stunnel\" -d $srcdir -r $HTTPPORT $HTTPSPORT &"; system($cmd); if($verbose) { print "CMD: $cmd\n"; @@ -776,6 +780,12 @@ sub checkcurl { printf("* libcurl SSL: %s\n", $ssl_version?"ON":"OFF"); printf("* libcurl debug: %s\n", $curl_debug?"ON":"OFF"); printf("* valgrind: %s\n", $valgrind?"ON":"OFF"); + printf("* HTTP on port: %d\n", $HTTPPORT); + printf("* FTP on port: %d\n", $FTPPORT); + if($stunnel) { + printf("* FTPS on port: %d\n", $FTPSPORT); + printf("* HTTPS on port: %d\n", $HTTPSPORT); + } print "***************************************** \n"; } @@ -786,8 +796,7 @@ sub checkcurl { sub subVariables { my ($thing) = @_; $$thing =~ s/%HOSTIP/$HOSTIP/g; - $$thing =~ s/%HOSTPORT/$HOSTPORT/g; - $$thing =~ s/%HTTPPORT/$HOSTPORT/g; + $$thing =~ s/%HTTPPORT/$HTTPPORT/g; $$thing =~ s/%HTTPSPORT/$HTTPSPORT/g; $$thing =~ s/%FTPPORT/$FTPPORT/g; $$thing =~ s/%FTPSPORT/$FTPSPORT/g; @@ -795,6 +804,15 @@ sub subVariables { $$thing =~ s/%PWD/$pwd/g; } +sub fixarray { + my @in = @_; + + for(@in) { + subVariables \$_; + } + return @in; +} + ####################################################################### # Run a single specified test case # @@ -908,17 +926,17 @@ sub singletest { } # curl command to run - my @curlcmd= getpart("client", "command"); + my @curlcmd= fixarray ( getpart("client", "command") ); # this is the valid protocol blurb curl should generate - my @protocol= getpart("verify", "protocol"); + my @protocol= fixarray ( getpart("verify", "protocol") ); # redirected stdout/stderr to these files $STDOUT="$LOGDIR/stdout$testnum"; $STDERR="$LOGDIR/stderr$testnum"; # if this section exists, we verify that the stdout contained this: - my @validstdout = getpart("verify", "stdout"); + my @validstdout = fixarray ( getpart("verify", "stdout") ); # if this section exists, we verify upload my @upload = getpart("verify", "upload"); @@ -1588,6 +1606,11 @@ if($valgrind) { } } +$HTTPPORT = $base + 0; # HTTP server port +$HTTPSPORT = $base + 1; # HTTPS server port +$FTPPORT = $base + 2; # FTP server port +$FTPSPORT = $base + 3; # FTPS server port + ####################################################################### # Output curl version and host info being tested # -- cgit v1.2.3