diff --git a/tests/data/test1 b/tests/data/test1 index 700bed8993..4aa4d1b812 100644 --- a/tests/data/test1 +++ b/tests/data/test1 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP GET - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test10 b/tests/data/test10 index b52850fa50..ac1486ec09 100644 --- a/tests/data/test10 +++ b/tests/data/test10 @@ -22,10 +22,10 @@ blablabla http - + simple HTTP PUT from file - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test100 b/tests/data/test100 index e680a7b4a5..de6a82bda9 100644 --- a/tests/data/test100 +++ b/tests/data/test100 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir list PASV - - + + ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ diff --git a/tests/data/test1000 b/tests/data/test1000 index 37f210ed8c..fe94010ac3 100644 --- a/tests/data/test1000 +++ b/tests/data/test1000 @@ -20,10 +20,10 @@ NOBODY ftp - + FTP dir list PASV with -I - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I diff --git a/tests/data/test1001 b/tests/data/test1001 index 8900a80a23..4220ab6759 100644 --- a/tests/data/test1001 +++ b/tests/data/test1001 @@ -68,10 +68,10 @@ http crypto proxy - + HTTP POST --digest with PUT and resumed upload and modified method - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test1002 b/tests/data/test1002 index 3a098f10d3..92cb5e1585 100644 --- a/tests/data/test1002 +++ b/tests/data/test1002 @@ -67,10 +67,10 @@ http crypto proxy - + HTTP PUT with Digest auth, resumed upload and modified method, twice - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T %LOGDIR/%TESTNUMBER -u auser:apasswd --digest -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test1003 b/tests/data/test1003 index 9adc996a92..06cfbb61b0 100644 --- a/tests/data/test1003 +++ b/tests/data/test1003 @@ -23,10 +23,10 @@ REPLY CWD 250 CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ftp - + FTP with excessively large server command response line - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test1004 b/tests/data/test1004 index 3b75081bd4..d176a16582 100644 --- a/tests/data/test1004 +++ b/tests/data/test1004 @@ -35,10 +35,10 @@ proxy http - + HTTP GET with empty proxy - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy "" diff --git a/tests/data/test1005 b/tests/data/test1005 index 59d98cc659..28af85f40e 100644 --- a/tests/data/test1005 +++ b/tests/data/test1005 @@ -23,10 +23,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ftp - + FTP with excessively large number of server command response lines - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test1006 b/tests/data/test1006 index 08f7247c17..394b5563b3 100644 --- a/tests/data/test1006 +++ b/tests/data/test1006 @@ -24,10 +24,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAA\r\n250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ftp - + FTP with excessively large number of server command response lines (boundary condition) - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test1007 b/tests/data/test1007 index e9f11c8b99..603d4c6390 100644 --- a/tests/data/test1007 +++ b/tests/data/test1007 @@ -13,10 +13,10 @@ FAILURE tftp - + TFTP send with invalid permission on server - - + + -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file -sS diff --git a/tests/data/test1009 b/tests/data/test1009 index 041d88198d..0282dca2ea 100644 --- a/tests/data/test1009 +++ b/tests/data/test1009 @@ -24,10 +24,10 @@ returned tftp - + TFTP retrieve with --local-port - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444 diff --git a/tests/data/test101 b/tests/data/test101 index 09faade2db..26824c7411 100644 --- a/tests/data/test101 +++ b/tests/data/test101 @@ -30,10 +30,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir list, PORT with specified IP - - + + ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP diff --git a/tests/data/test1010 b/tests/data/test1010 index 9314ca66ee..d1eee918af 100644 --- a/tests/data/test1010 +++ b/tests/data/test1010 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir list nocwd - - + + ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ --ftp-method nocwd diff --git a/tests/data/test1011 b/tests/data/test1011 index 1ff01ca6b8..d6a3d1aa7d 100644 --- a/tests/data/test1011 +++ b/tests/data/test1011 @@ -45,10 +45,10 @@ body http - + HTTP POST with 301 redirect - - + + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" diff --git a/tests/data/test1012 b/tests/data/test1012 index af17bb8184..da6ec61922 100644 --- a/tests/data/test1012 +++ b/tests/data/test1012 @@ -45,10 +45,10 @@ body http - + HTTP POST with 301 redirect and --post301 - - + + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301 diff --git a/tests/data/test1013 b/tests/data/test1013 index 70c6455e30..d748657b5d 100644 --- a/tests/data/test1013 +++ b/tests/data/test1013 @@ -16,10 +16,10 @@ curl-config none - + Compare curl --version with curl-config --protocols - - + + --version diff --git a/tests/data/test1014 b/tests/data/test1014 index 8dc3f0421e..f03ac859db 100644 --- a/tests/data/test1014 +++ b/tests/data/test1014 @@ -16,10 +16,10 @@ curl-config none - + Compare curl --version with curl-config --features - - + + --version diff --git a/tests/data/test1015 b/tests/data/test1015 index 47f382775d..fc26149121 100644 --- a/tests/data/test1015 +++ b/tests/data/test1015 @@ -24,10 +24,10 @@ Content-Length: 0 http - + --data-urlencode - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@%LOGDIR/%TESTNUMBER.txt" --data-urlencode @%LOGDIR/%TESTNUMBER.txt diff --git a/tests/data/test1016 b/tests/data/test1016 index d37e585e05..452d11c8a0 100644 --- a/tests/data/test1016 +++ b/tests/data/test1016 @@ -19,9 +19,9 @@ none file - + X-Y range on a file:// URL to stdout - + -r 1-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1017 b/tests/data/test1017 index bda9c2d49f..ceb32f20e8 100644 --- a/tests/data/test1017 +++ b/tests/data/test1017 @@ -20,9 +20,9 @@ none file - + 0-Y range on a file:// URL to stdout - + -r 0-3 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1018 b/tests/data/test1018 index 2d0d1574e0..210f1d386f 100644 --- a/tests/data/test1018 +++ b/tests/data/test1018 @@ -19,9 +19,9 @@ none file - + X-X range on a file:// URL to stdout - + -r 4-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1019 b/tests/data/test1019 index ecf74fe9e6..73d6cb0616 100644 --- a/tests/data/test1019 +++ b/tests/data/test1019 @@ -20,9 +20,9 @@ none file - + X- range on a file:// URL to stdout - + -r 7- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test102 b/tests/data/test102 index 19be935647..7037986f46 100644 --- a/tests/data/test102 +++ b/tests/data/test102 @@ -26,10 +26,10 @@ REPLY EPSV 500 no such command ftp - + FTP RETR PASV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1020 b/tests/data/test1020 index 2a92908d5f..c2cd7f2d23 100644 --- a/tests/data/test1020 +++ b/tests/data/test1020 @@ -20,9 +20,9 @@ none file - + -Y range on a file:// URL to stdout - + -r -9 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1022 b/tests/data/test1022 index 2288e9b99a..6a5dd2180a 100644 --- a/tests/data/test1022 +++ b/tests/data/test1022 @@ -16,10 +16,10 @@ curl-config none - + Compare curl --version with curl-config --version - - + + --version diff --git a/tests/data/test1023 b/tests/data/test1023 index 27a144db55..1d8cbfb4c0 100644 --- a/tests/data/test1023 +++ b/tests/data/test1023 @@ -16,10 +16,10 @@ curl-config none - + Compare curl --version with curl-config --vernum - - + + --version diff --git a/tests/data/test1024 b/tests/data/test1024 index fbd1db4223..55deec98bb 100644 --- a/tests/data/test1024 +++ b/tests/data/test1024 @@ -71,10 +71,10 @@ If this is received, the location following worked http - + HTTP Location: following with cookies - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER diff --git a/tests/data/test1025 b/tests/data/test1025 index 039824c1ae..762e34a835 100644 --- a/tests/data/test1025 +++ b/tests/data/test1025 @@ -71,10 +71,10 @@ If this is received, the location following worked http - + HTTP Location: following with command-line and server cookies - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER -b forcedcookie=yes diff --git a/tests/data/test1026 b/tests/data/test1026 index f836e9875a..d565f24d5f 100644 --- a/tests/data/test1026 +++ b/tests/data/test1026 @@ -19,10 +19,10 @@ manual none - + curl --manual - - + + --manual # Search for these two sentinel lines in the manual output; if they are found, diff --git a/tests/data/test1027 b/tests/data/test1027 index 6ce71b0cc7..1d076000b0 100644 --- a/tests/data/test1027 +++ b/tests/data/test1027 @@ -16,10 +16,10 @@ none - + curl --help - - + + --help # Search for these two sentinel lines in the help output; if they are found, diff --git a/tests/data/test1028 b/tests/data/test1028 index cff3028157..3e36597322 100644 --- a/tests/data/test1028 +++ b/tests/data/test1028 @@ -41,10 +41,10 @@ works http ftp - + HTTP Location: redirect to FTP URL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L diff --git a/tests/data/test1029 b/tests/data/test1029 index f39ac6ed47..da393cb41b 100644 --- a/tests/data/test1029 +++ b/tests/data/test1029 @@ -26,9 +26,9 @@ This server reply is for testing a simple Location: following http - + HTTP Location: and 'redirect_url' check - + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{exitcode} %{errormsg}\n' diff --git a/tests/data/test103 b/tests/data/test103 index 308c15491f..52e5645bc0 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -23,10 +23,10 @@ works ftp - + FTP RETR PORT with CWD - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P - diff --git a/tests/data/test1030 b/tests/data/test1030 index c84033af3c..1421e769ba 100644 --- a/tests/data/test1030 +++ b/tests/data/test1030 @@ -63,10 +63,10 @@ http !SSPI crypto - + HTTP PUT with --anyauth authorization (picking Digest) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1031 b/tests/data/test1031 index c6e479588f..305a0f7eb5 100644 --- a/tests/data/test1031 +++ b/tests/data/test1031 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + HTTP Location: following to a query string - - + + http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L diff --git a/tests/data/test1032 b/tests/data/test1032 index 8af07dc78c..5456542ae3 100644 --- a/tests/data/test1032 +++ b/tests/data/test1032 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP HEAD with --range - - + + --range 1-3 --head http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1033 b/tests/data/test1033 index 7d9ff0364b..b19bf1ce96 100644 --- a/tests/data/test1033 +++ b/tests/data/test1033 @@ -36,10 +36,10 @@ Funny-head: yesyes http - + HTTP GET with 102 response! - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1034 b/tests/data/test1034 index ec41651a21..2a8170487e 100644 --- a/tests/data/test1034 +++ b/tests/data/test1034 @@ -34,16 +34,16 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + HTTP over proxy with malformatted IDN host name - + # This host name contains an invalid UTF-8 byte sequence that can't be # converted into an IDN name url = "http://invalid-utf8-.local/page/%TESTNUMBER" - + -K - -x %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1035 b/tests/data/test1035 index 73d8aefed5..1ace9428dd 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -32,10 +32,10 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + HTTP over proxy with too long IDN host name - - + + http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/%TESTNUMBER -x %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1036 b/tests/data/test1036 index 88183bc7df..f777a6ff7d 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -27,10 +27,10 @@ REPLY EPSV 500 no such command ftp - + FTP download resume from end of file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - diff --git a/tests/data/test1037 b/tests/data/test1037 index 6d3ede54ac..18c9e5266a 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -27,10 +27,10 @@ REPLY EPSV 500 no such command ftp - + FTP download resume from end of empty file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - diff --git a/tests/data/test1038 b/tests/data/test1038 index 46fe821fa9..c2e60a0a49 100644 --- a/tests/data/test1038 +++ b/tests/data/test1038 @@ -19,10 +19,10 @@ Resume ftp - + FTP PASV upload resume from end of file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - diff --git a/tests/data/test1039 b/tests/data/test1039 index 9f6d51306b..a032c2f9ab 100644 --- a/tests/data/test1039 +++ b/tests/data/test1039 @@ -19,10 +19,10 @@ Resume ftp - + FTP PASV upload resume from end of empty file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - diff --git a/tests/data/test104 b/tests/data/test104 index 8b44911dec..3674f1da0a 100644 --- a/tests/data/test104 +++ b/tests/data/test104 @@ -17,10 +17,10 @@ NOBODY ftp - + FTP --head to get file size only - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head diff --git a/tests/data/test1040 b/tests/data/test1040 index 21410c6e97..bd1e5b0e32 100644 --- a/tests/data/test1040 +++ b/tests/data/test1040 @@ -43,10 +43,10 @@ Content-Length: 0 http - + HTTP GET with resume from end of entirely-downloaded file - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - diff --git a/tests/data/test1041 b/tests/data/test1041 index 4e23e2cb6c..bb793d51ea 100644 --- a/tests/data/test1041 +++ b/tests/data/test1041 @@ -28,9 +28,9 @@ Content-Type: text/html http - + HTTP PUT with resume from end of already-uploaded file - + 012345678 012345678 @@ -43,7 +43,7 @@ HTTP PUT with resume from end of already-uploaded file 012345678 012345678 - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C - diff --git a/tests/data/test1042 b/tests/data/test1042 index f05c873639..a2a5c62f36 100644 --- a/tests/data/test1042 +++ b/tests/data/test1042 @@ -55,10 +55,10 @@ Content-Type: text/plain http - + HTTP GET beyond end of entirely-downloaded file, no server resume - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200 diff --git a/tests/data/test1043 b/tests/data/test1043 index 310256f65b..ea850a1f97 100644 --- a/tests/data/test1043 +++ b/tests/data/test1043 @@ -54,10 +54,10 @@ Content-Range: bytes 40-99/100 http - + HTTP GET with resume from end of file - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - diff --git a/tests/data/test1044 b/tests/data/test1044 index c5f3a29251..96a4f48c23 100644 --- a/tests/data/test1044 +++ b/tests/data/test1044 @@ -28,10 +28,10 @@ large_file ftp - + FTP download large file info with -I - - + + ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I diff --git a/tests/data/test1045 b/tests/data/test1045 index c2c7df7f68..e8745bf2de 100644 --- a/tests/data/test1045 +++ b/tests/data/test1045 @@ -28,10 +28,10 @@ Content-Type: text/plain http - + HTTP GET with numeric localhost --interface - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP diff --git a/tests/data/test1046 b/tests/data/test1046 index f781098934..c6bdcbb24b 100644 --- a/tests/data/test1046 +++ b/tests/data/test1046 @@ -32,10 +32,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET with numeric localhost --interface - - + + -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ::1 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out diff --git a/tests/data/test1047 b/tests/data/test1047 index 028a8a6cc5..d54a8494db 100644 --- a/tests/data/test1047 +++ b/tests/data/test1047 @@ -34,10 +34,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir list PASV with localhost --interface - - + + ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP diff --git a/tests/data/test1048 b/tests/data/test1048 index e81e19f263..56f19c4af3 100644 --- a/tests/data/test1048 +++ b/tests/data/test1048 @@ -39,10 +39,10 @@ ipv6 ftp-ipv6 - + FTP-IPv6 dir list PASV with localhost --interface - - + + -g "ftp://%HOST6IP:%FTP6PORT/" --interface ::1 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out diff --git a/tests/data/test1049 b/tests/data/test1049 index 165ba1ea79..e59741f519 100644 --- a/tests/data/test1049 +++ b/tests/data/test1049 @@ -24,10 +24,10 @@ returned tftp - + TFTP retrieve with localhost --interface - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP diff --git a/tests/data/test105 b/tests/data/test105 index 74922d5598..2a26ac7eca 100644 --- a/tests/data/test105 +++ b/tests/data/test105 @@ -27,10 +27,10 @@ REPLY EPSV 500 no such command ftp - + FTP user+password in URL and ASCII transfer - - + + ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii diff --git a/tests/data/test1050 b/tests/data/test1050 index 281936bfec..ff179c637b 100644 --- a/tests/data/test1050 +++ b/tests/data/test1050 @@ -35,10 +35,10 @@ ipv6 ftp-ipv6 - + FTP-IPv6 dir list, EPRT with specified IP - - + + -g "ftp://%HOST6IP:%FTP6PORT/" -P ::1 # --interface doesn't accept an address surrounded by [] so %CLIENT6IP is out diff --git a/tests/data/test1051 b/tests/data/test1051 index fab1dbf957..921aaeb780 100644 --- a/tests/data/test1051 +++ b/tests/data/test1051 @@ -52,10 +52,10 @@ If this is received, the location following worked http - + HTTP PUT with Location: following - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1052 b/tests/data/test1052 index 0ae56d033a..ade77bde55 100644 --- a/tests/data/test1052 +++ b/tests/data/test1052 @@ -48,10 +48,10 @@ If this is received, the location following worked http - + HTTP 1.0 PUT with Location: following - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1053 b/tests/data/test1053 index e74a70c9dc..30ca83ab2d 100644 --- a/tests/data/test1053 +++ b/tests/data/test1053 @@ -57,10 +57,10 @@ Mime http - + HTTP RFC1867-type formposting from file with Location: following - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! diff --git a/tests/data/test1054 b/tests/data/test1054 index d972579b90..b0425e545c 100644 --- a/tests/data/test1054 +++ b/tests/data/test1054 @@ -44,13 +44,13 @@ body http - + HTTP POST from file with 301 redirect and --post301 - + field=data - + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --post301 diff --git a/tests/data/test1055 b/tests/data/test1055 index 937068028d..2d1c604b4d 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -32,10 +32,10 @@ Connection: close http ftp - + HTTP PUT Location: redirect to FTP URL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1056 b/tests/data/test1056 index b5e3fd7ebf..40879662a3 100644 --- a/tests/data/test1056 +++ b/tests/data/test1056 @@ -55,10 +55,10 @@ ipv6 http http-ipv6 - + HTTP follow redirect from IPv4 to IPv6 with scope - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test1057 b/tests/data/test1057 index ce3fc0b61f..a7cb3bc61e 100644 --- a/tests/data/test1057 +++ b/tests/data/test1057 @@ -26,10 +26,10 @@ Range ftp - + FTP retrieve a byte-range relative to end of file - - + + -r -12 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1058 b/tests/data/test1058 index ee6c300c10..794d2ef22a 100644 --- a/tests/data/test1058 +++ b/tests/data/test1058 @@ -29,10 +29,10 @@ in the request http - + HTTP range relative to end of file - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101 diff --git a/tests/data/test1059 b/tests/data/test1059 index 95d4b95cde..5da753e594 100644 --- a/tests/data/test1059 +++ b/tests/data/test1059 @@ -31,10 +31,10 @@ proxy http - + HTTP CONNECT with proxytunnel to unsupported FTP URL - - + + ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test106 b/tests/data/test106 index 981e9dfa9d..b5e1e6929b 100644 --- a/tests/data/test106 +++ b/tests/data/test106 @@ -25,10 +25,10 @@ works ftp - + FTP GET with type=A style ASCII URL using %20 codes - - + + "ftp://%HOSTIP:%FTPPORT//path%20with%20%20spaces//and%20things2/%TESTNUMBER;type=A" diff --git a/tests/data/test1060 b/tests/data/test1060 index 7eab061e65..c1ad6c6676 100644 --- a/tests/data/test1060 +++ b/tests/data/test1060 @@ -871,10 +871,10 @@ http crypto proxy - + HTTP proxy CONNECT auth Digest, large headers and data - - + + http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel diff --git a/tests/data/test1061 b/tests/data/test1061 index c7fcedbc9f..76241142c9 100644 --- a/tests/data/test1061 +++ b/tests/data/test1061 @@ -876,10 +876,10 @@ http crypto proxy - + HTTP proxy CONNECT auth Digest, large headers and chunked data - - + + http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel diff --git a/tests/data/test1062 b/tests/data/test1062 index df72e66223..31a27a9473 100644 --- a/tests/data/test1062 +++ b/tests/data/test1062 @@ -24,10 +24,10 @@ REPLY CWD 250-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ftp - + FTP with excessively long server command response lines, boundary condition - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test1063 b/tests/data/test1063 index 8f263c8131..fcbc4b883f 100644 --- a/tests/data/test1063 +++ b/tests/data/test1063 @@ -22,12 +22,12 @@ none file large_file - + Invalid large X- range on a file:// - + # This range value is 2**32+7, which will be truncated to the valid value 7 # if the large file support is not working correctly - + -r 4294967303- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1064 b/tests/data/test1064 index 298486616b..55eeb38dac 100644 --- a/tests/data/test1064 +++ b/tests/data/test1064 @@ -31,10 +31,10 @@ still ok http - + HTTP PUT twice - - + + -H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2 diff --git a/tests/data/test1065 b/tests/data/test1065 index bd4be888f6..3b1c652b58 100644 --- a/tests/data/test1065 +++ b/tests/data/test1065 @@ -32,10 +32,10 @@ still ok http - + HTTP PUT with one file but two URLs - - + + -H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2 diff --git a/tests/data/test1066 b/tests/data/test1066 index 1fbd7dc08c..5b2b178f09 100644 --- a/tests/data/test1066 +++ b/tests/data/test1066 @@ -31,10 +31,10 @@ second http - + HTTP --dump-header - with two URLs - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER0001 --dump-header - diff --git a/tests/data/test1067 b/tests/data/test1067 index e5023f58f1..8bb2233e36 100644 --- a/tests/data/test1067 +++ b/tests/data/test1067 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + HTTP Location: following with auto-referer - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firstone.html;auto" --write-out "%{stderr}|%{referer}|" diff --git a/tests/data/test1068 b/tests/data/test1068 index bf3ae4ee01..982385400e 100644 --- a/tests/data/test1068 +++ b/tests/data/test1068 @@ -28,7 +28,7 @@ http HTTP PUT from stdin - + http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - diff --git a/tests/data/test1069 b/tests/data/test1069 index 2eb6659221..5156941833 100644 --- a/tests/data/test1069 +++ b/tests/data/test1069 @@ -19,7 +19,7 @@ http HTTP 1.0 PUT from stdin with no content length - + http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -0 diff --git a/tests/data/test107 b/tests/data/test107 index 5feffac412..a741b7667f 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -12,9 +12,9 @@ STOR ftp - + FTP PASV upload file - + data to @@ -23,7 +23,7 @@ that FTP works so does it? - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1070 b/tests/data/test1070 index ce88a1f048..1f5d6cf94d 100644 --- a/tests/data/test1070 +++ b/tests/data/test1070 @@ -28,10 +28,10 @@ skip: 2300 http - + HTTP POST with server closing connection before (all) data is received - - + + -d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue" diff --git a/tests/data/test1071 b/tests/data/test1071 index 568471eafa..180c467b1c 100644 --- a/tests/data/test1071 +++ b/tests/data/test1071 @@ -69,10 +69,10 @@ http !SSPI crypto - + Downgraded HTTP PUT to HTTP 1.0 with authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1072 b/tests/data/test1072 index c0d4c18d4a..f0390fb7f3 100644 --- a/tests/data/test1072 +++ b/tests/data/test1072 @@ -36,10 +36,10 @@ http crypto - + HTTP chunked PUT to HTTP 1.0 server with authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -u testuser:testpass --anyauth diff --git a/tests/data/test1073 b/tests/data/test1073 index 3f6d703178..2bc40f0577 100644 --- a/tests/data/test1073 +++ b/tests/data/test1073 @@ -30,10 +30,10 @@ Connection: close http - + HTTP chunked PUT to HTTP 1.0 server with redirect - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T - -L diff --git a/tests/data/test1074 b/tests/data/test1074 index 08ff5076a7..183d51a571 100644 --- a/tests/data/test1074 +++ b/tests/data/test1074 @@ -36,10 +36,10 @@ wait 1 http - + HTTP downgrade to HTTP/1.0 on second request - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001 diff --git a/tests/data/test1075 b/tests/data/test1075 index 2dac5bf986..15d92988c8 100644 --- a/tests/data/test1075 +++ b/tests/data/test1075 @@ -48,10 +48,10 @@ Content-Length: 0 http - + HTTP PUT with --anyauth authorization (picking Basic) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1076 b/tests/data/test1076 index 017a7d11e5..258d14e6a8 100644 --- a/tests/data/test1076 +++ b/tests/data/test1076 @@ -45,10 +45,10 @@ body http - + HTTP POST with 302 redirect and --post302 - - + + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302 diff --git a/tests/data/test1077 b/tests/data/test1077 index 28af6e9787..5162eb3420 100644 --- a/tests/data/test1077 +++ b/tests/data/test1077 @@ -46,10 +46,10 @@ http ftp proxy - + FTP over HTTP proxy with downgrade to HTTP 1.0 - - + + -x %HOSTIP:%HTTPPORT ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 diff --git a/tests/data/test1078 b/tests/data/test1078 index 2e1defac3b..97b30853fc 100644 --- a/tests/data/test1078 +++ b/tests/data/test1078 @@ -39,10 +39,10 @@ contents http http-proxy - + HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0 - - + + --proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER diff --git a/tests/data/test1079 b/tests/data/test1079 index 361c4bd0d6..180c48316e 100644 --- a/tests/data/test1079 +++ b/tests/data/test1079 @@ -45,10 +45,10 @@ http !SSPI crypto - + HTTP retry after closed connection and empty response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test108 b/tests/data/test108 index 7efc748d41..20ef6577ed 100644 --- a/tests/data/test108 +++ b/tests/data/test108 @@ -17,10 +17,10 @@ STOR ftp - + FTP PORT upload with CWD - - + + ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P - diff --git a/tests/data/test1080 b/tests/data/test1080 index bc7249a930..6b9dd5a136 100644 --- a/tests/data/test1080 +++ b/tests/data/test1080 @@ -26,10 +26,10 @@ This server reply is for testing a simple Location: following http - + HTTP Location: on two URLs 'redirect_url' check - - + + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' diff --git a/tests/data/test1081 b/tests/data/test1081 index 9f5a192e7e..557be4fe65 100644 --- a/tests/data/test1081 +++ b/tests/data/test1081 @@ -34,10 +34,10 @@ This second URL does not have a location http - + HTTP no Location: on second URL 'redirect_url' check - - + + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER0002 -w '%{redirect_url}\n' diff --git a/tests/data/test1082 b/tests/data/test1082 index d4dd0e9b5f..606df1c86b 100644 --- a/tests/data/test1082 +++ b/tests/data/test1082 @@ -28,10 +28,10 @@ Content-Type: text/plain http - + HTTP GET with localhost --interface - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1 diff --git a/tests/data/test1083 b/tests/data/test1083 index d7713b1cf2..8728d61832 100644 --- a/tests/data/test1083 +++ b/tests/data/test1083 @@ -32,10 +32,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET with ip6-localhost --interface - - + + -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --interface ip6-localhost diff --git a/tests/data/test1084 b/tests/data/test1084 index 7a6292b88a..1e311a8b15 100644 --- a/tests/data/test1084 +++ b/tests/data/test1084 @@ -23,10 +23,10 @@ http none - + HTTP GET with invalid --interface - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se. diff --git a/tests/data/test1085 b/tests/data/test1085 index 582fdb085f..b63b0f033b 100644 --- a/tests/data/test1085 +++ b/tests/data/test1085 @@ -25,10 +25,10 @@ ipv6 none - + HTTP-IPv6 GET with invalid --interface - - + + -g "http://%HOST6IP:%NOLISTENPORT/%TESTNUMBER" --interface non-existing-host.haxx.se. # Ensure the IPv6 stack is operational before running this test (other tests diff --git a/tests/data/test1086 b/tests/data/test1086 index 0bb309bea9..0b4b875d9e 100644 --- a/tests/data/test1086 +++ b/tests/data/test1086 @@ -86,10 +86,10 @@ ftp ftp - + FTP download with strict timeout and slow data transfer - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 7 diff --git a/tests/data/test1087 b/tests/data/test1087 index b084c9b649..f28b62106f 100644 --- a/tests/data/test1087 +++ b/tests/data/test1087 @@ -74,10 +74,10 @@ contents http - + HTTP, proxy with --anyauth and Location: to new host - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth diff --git a/tests/data/test1088 b/tests/data/test1088 index 9f12f25ab2..e5ae3c2c11 100644 --- a/tests/data/test1088 +++ b/tests/data/test1088 @@ -75,10 +75,10 @@ contents http - + HTTP, proxy with --anyauth and Location: to new host using location-trusted - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth diff --git a/tests/data/test1089 b/tests/data/test1089 index c8c5307aa3..c36f21cbbe 100644 --- a/tests/data/test1089 +++ b/tests/data/test1089 @@ -39,10 +39,10 @@ bigger monster http - + HTTP GET --write-out with redirected fetch - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L diff --git a/tests/data/test109 b/tests/data/test109 index baab37b30f..d466437f21 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -17,10 +17,10 @@ APPE ftp - + FTP PASV upload append - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --append diff --git a/tests/data/test1090 b/tests/data/test1090 index 0551519fb4..ffd81bc610 100644 --- a/tests/data/test1090 +++ b/tests/data/test1090 @@ -46,10 +46,10 @@ monster http - + HTTP GET --write-out with redirected fetch and chunked reply - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L diff --git a/tests/data/test1091 b/tests/data/test1091 index 788f2dc27a..445d31655f 100644 --- a/tests/data/test1091 +++ b/tests/data/test1091 @@ -20,10 +20,10 @@ bla bla bla ftp - + FTP URL with type=i - - + + "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=i" --use-ascii diff --git a/tests/data/test1092 b/tests/data/test1092 index 1c3c4696fb..3d7b741ea7 100644 --- a/tests/data/test1092 +++ b/tests/data/test1092 @@ -32,10 +32,10 @@ http ftp proxy - + FTP with type=i over HTTP proxy - - + + "ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i" --use-ascii -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test1093 b/tests/data/test1093 index 3d903412e2..1bed99bec1 100644 --- a/tests/data/test1093 +++ b/tests/data/test1093 @@ -24,10 +24,10 @@ returned tftp - + TFTP retrieve with mode=i - - + + "tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=i" --use-ascii diff --git a/tests/data/test1094 b/tests/data/test1094 index 1b2a585919..ec1728976b 100644 --- a/tests/data/test1094 +++ b/tests/data/test1094 @@ -30,10 +30,10 @@ returned tftp - + TFTP retrieve with mode=netascii - - + + "tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER;mode=netascii" diff --git a/tests/data/test1095 b/tests/data/test1095 index d4cc082d10..8480c8a473 100644 --- a/tests/data/test1095 +++ b/tests/data/test1095 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with Digest and realm with quoted quotes - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test1096 b/tests/data/test1096 index 3ab30ab8a1..e7b1639247 100644 --- a/tests/data/test1096 +++ b/tests/data/test1096 @@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood ftp - + Two FTP downloads, with failed RETR but reused control connection - - + + ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER diff --git a/tests/data/test1097 b/tests/data/test1097 index 5a73e89b43..106a8537b8 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -49,10 +49,10 @@ SSL !SSPI proxy - + HTTP POST using CONNECT with --proxy-ntlm but no auth is required - - + + http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p diff --git a/tests/data/test1098 b/tests/data/test1098 index 8e31c32b66..dac208949a 100644 --- a/tests/data/test1098 +++ b/tests/data/test1098 @@ -31,11 +31,11 @@ http ftp proxy - + FTP RETR twice over proxy confirming persistent connection - + - + ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1099 b/tests/data/test1099 index 34cd99129d..2a97f6863b 100644 --- a/tests/data/test1099 +++ b/tests/data/test1099 @@ -19,10 +19,10 @@ data for %TESTNUMBER tftp - + TFTP get first a non-existing file then an existing - - + + tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER diff --git a/tests/data/test11 b/tests/data/test11 index 89844ea146..5affc6bde2 100644 --- a/tests/data/test11 +++ b/tests/data/test11 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + simple HTTP Location: following - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L diff --git a/tests/data/test110 b/tests/data/test110 index 6c892ed2a5..e53fcd1377 100644 --- a/tests/data/test110 +++ b/tests/data/test110 @@ -26,10 +26,10 @@ REPLY EPSV 500 no such command ftp - + FTP download resume with set limit - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20 diff --git a/tests/data/test1100 b/tests/data/test1100 index 774cc9a80f..1148a79f75 100644 --- a/tests/data/test1100 +++ b/tests/data/test1100 @@ -70,16 +70,16 @@ debug http - + HTTP POST with NTLM authorization and following a 302 redirect - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to send away" diff --git a/tests/data/test1101 b/tests/data/test1101 index f7e504f910..02aced8ce4 100644 --- a/tests/data/test1101 +++ b/tests/data/test1101 @@ -25,15 +25,15 @@ boo http - + NO_PROXY test, with user name in URL - + no_proxy=%HOSTIP http_proxy=http://non-existing-host.haxx.se:3128/ - + http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER diff --git a/tests/data/test1102 b/tests/data/test1102 index c2fd03438f..16994d9533 100644 --- a/tests/data/test1102 +++ b/tests/data/test1102 @@ -24,10 +24,10 @@ REPLY SITE 250 Name format set to 1 ftp - + FTP OS/400 server name format check - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1103 b/tests/data/test1103 index 4624c9d216..a53b504bdc 100644 --- a/tests/data/test1103 +++ b/tests/data/test1103 @@ -23,10 +23,10 @@ REPLY SYST 215 unknown-OS runs this server ftp - + FTP non-OS/400 server - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1104 b/tests/data/test1104 index b77c557683..9c5d659bc3 100644 --- a/tests/data/test1104 +++ b/tests/data/test1104 @@ -55,10 +55,10 @@ If this is received, the location following worked http - + HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970 - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c %LOGDIR/cookies%TESTNUMBER.jar diff --git a/tests/data/test1105 b/tests/data/test1105 index 6434ab2e40..afe621bb0d 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -31,10 +31,10 @@ Set-Cookie: bar=foo bar http - + HTTP with cookie parser and header recording - - + + "http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword" diff --git a/tests/data/test1106 b/tests/data/test1106 index f6e589302a..e3acdac16b 100644 --- a/tests/data/test1106 +++ b/tests/data/test1106 @@ -29,14 +29,14 @@ proxy http - + FTP URL and with ftp_proxy environment variable set - + ftp_proxy=http://%HOSTIP:%HTTPPORT/ - + ftp://%HOSTIP:23456/%TESTNUMBER diff --git a/tests/data/test1107 b/tests/data/test1107 index 4946e89376..8b31c76f83 100644 --- a/tests/data/test1107 +++ b/tests/data/test1107 @@ -27,10 +27,10 @@ REPLY PRET 200 fine ftp - + FTP RETR PASV with PRET - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret diff --git a/tests/data/test1108 b/tests/data/test1108 index 3667b118b4..c6008af300 100644 --- a/tests/data/test1108 +++ b/tests/data/test1108 @@ -20,10 +20,10 @@ REPLY PRET 550 unknown command ftp - + FTP RETR PASV with PRET not supported - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret diff --git a/tests/data/test1109 b/tests/data/test1109 index eb209a5d6a..93aa9e4dbc 100644 --- a/tests/data/test1109 +++ b/tests/data/test1109 @@ -22,10 +22,10 @@ hello http - + HTTP GET with URL that contains fragment after the path - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test diff --git a/tests/data/test111 b/tests/data/test111 index 25df3aee50..a46f7aef1d 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -19,10 +19,10 @@ FAILURE ftp - + FTP download resume beyond file size - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000 diff --git a/tests/data/test1110 b/tests/data/test1110 index a363fef9ca..165a8acd86 100644 --- a/tests/data/test1110 +++ b/tests/data/test1110 @@ -23,10 +23,10 @@ hello http - + HTTP GET with URL that contains a fragment after the query part - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment diff --git a/tests/data/test1111 b/tests/data/test1111 index 1e9203a45c..157cd2751c 100644 --- a/tests/data/test1111 +++ b/tests/data/test1111 @@ -23,10 +23,10 @@ hello http - + HTTP GET with URL whose fragment contains a # (which is illegal) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2 diff --git a/tests/data/test1112 b/tests/data/test1112 index e97392009e..b0a6106605 100644 --- a/tests/data/test1112 +++ b/tests/data/test1112 @@ -89,10 +89,10 @@ ftps ftps - + FTPS download with strict timeout and slow data transfer - - + + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 16 diff --git a/tests/data/test1114 b/tests/data/test1114 index 573eda4d2f..e8a87ab11e 100644 --- a/tests/data/test1114 +++ b/tests/data/test1114 @@ -21,10 +21,10 @@ ftp lib576 - + FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (DOS) - - + + ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/* diff --git a/tests/data/test1115 b/tests/data/test1115 index f14182c87d..40ce7c15e1 100644 --- a/tests/data/test1115 +++ b/tests/data/test1115 @@ -29,10 +29,10 @@ Content-Length: 0 http - + HTTP GET with unexpected 1xx response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1116 b/tests/data/test1116 index b106c074dd..af323fad68 100644 --- a/tests/data/test1116 +++ b/tests/data/test1116 @@ -53,10 +53,10 @@ writedelay: 10 http - + HTTP GET with chunked trailer without Trailer: - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER diff --git a/tests/data/test1117 b/tests/data/test1117 index b2b5a3b173..4399d7d21f 100644 --- a/tests/data/test1117 +++ b/tests/data/test1117 @@ -41,10 +41,10 @@ writedelay: 1000 http - + HTTP with invalid range then another URL - - + + -r 10-22 http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001 diff --git a/tests/data/test1118 b/tests/data/test1118 index 9024e0864b..3daa8a63e7 100644 --- a/tests/data/test1118 +++ b/tests/data/test1118 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + URL without slash and @-letter in query - - + + http://%HOSTIP:%HTTPPORT?email=name@example.com/%TESTNUMBER diff --git a/tests/data/test1119 b/tests/data/test1119 index 2f1b54c23c..41f6dba2c1 100644 --- a/tests/data/test1119 +++ b/tests/data/test1119 @@ -13,9 +13,9 @@ symbols-in-versions none - + Verify that symbols-in-versions and headers are in sync - + %SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl diff --git a/tests/data/test112 b/tests/data/test112 index c48506c366..41bbc025d9 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -16,10 +16,10 @@ Resume ftp - + FTP PASV upload resume - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 40 diff --git a/tests/data/test1120 b/tests/data/test1120 index 06d0b909db..464b8ac097 100644 --- a/tests/data/test1120 +++ b/tests/data/test1120 @@ -21,10 +21,10 @@ REPLY CWD 421 Timeout! ftp - + FTP with 421 timeout response - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER diff --git a/tests/data/test1121 b/tests/data/test1121 index 823a52e7ab..3eec862d6d 100644 --- a/tests/data/test1121 +++ b/tests/data/test1121 @@ -23,10 +23,10 @@ blaha http - + HTTP multiple provided Host: headers - - + + -H "Host: host1" -H "Host: host2" -H "Host: host3" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1122 b/tests/data/test1122 index a9f6c434fe..478bafb3cf 100644 --- a/tests/data/test1122 +++ b/tests/data/test1122 @@ -45,10 +45,10 @@ libz http - + HTTP GET gzip transfer-encoded content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding diff --git a/tests/data/test1123 b/tests/data/test1123 index 036c78d8cd..bfa8abc065 100644 --- a/tests/data/test1123 +++ b/tests/data/test1123 @@ -174,10 +174,10 @@ libz http - + HTTP GET deflate transfer-encoded content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding diff --git a/tests/data/test1124 b/tests/data/test1124 index fc3c9cf696..0b198c6383 100644 --- a/tests/data/test1124 +++ b/tests/data/test1124 @@ -43,10 +43,10 @@ libz http - + HTTP GET gzip+chunked transfer-encoded content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding diff --git a/tests/data/test1125 b/tests/data/test1125 index 43e00a5f04..62e56e6e70 100644 --- a/tests/data/test1125 +++ b/tests/data/test1125 @@ -43,10 +43,10 @@ libz http - + HTTP GET transfer-encoding with custom Connection: - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close" diff --git a/tests/data/test1126 b/tests/data/test1126 index d45f40dad9..b25820b0cf 100644 --- a/tests/data/test1126 +++ b/tests/data/test1126 @@ -27,10 +27,10 @@ Content-Type: text/html http - + HTTP 200 If-Modified-Since with newer document - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT" diff --git a/tests/data/test1127 b/tests/data/test1127 index 968f80bf14..fa3ee85fe7 100644 --- a/tests/data/test1127 +++ b/tests/data/test1127 @@ -36,10 +36,10 @@ Content-Type: text/html http - + HTTP 200 If-Modified-Since with older document - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT" diff --git a/tests/data/test1128 b/tests/data/test1128 index 193ee40dab..37b5b522ed 100644 --- a/tests/data/test1128 +++ b/tests/data/test1128 @@ -37,10 +37,10 @@ Content-Type: text/html http - + HTTP 200 If-Modified-Since with old+new documents - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z "dec 12 12:00:00 1999 GMT" diff --git a/tests/data/test1129 b/tests/data/test1129 index b1ee1066b5..a649a38e9d 100644 --- a/tests/data/test1129 +++ b/tests/data/test1129 @@ -47,9 +47,9 @@ skip: 1053700 http - + HTTP POST expect 100-continue with a 404 - + -d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test113 b/tests/data/test113 index 8264a6f2dd..1c0a8b246c 100644 --- a/tests/data/test113 +++ b/tests/data/test113 @@ -17,10 +17,10 @@ REPLY USER 314 bluah you fewl! ftp - + FTP download, failed login: USER not valid - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1130 b/tests/data/test1130 index 1107941896..133363de1a 100644 --- a/tests/data/test1130 +++ b/tests/data/test1130 @@ -48,9 +48,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX http - + HTTP POST forced expect 100-continue with a 404 - + -d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 999 diff --git a/tests/data/test1131 b/tests/data/test1131 index 5725e71eb8..b5e738802c 100644 --- a/tests/data/test1131 +++ b/tests/data/test1131 @@ -48,9 +48,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX http - + HTTP PUT expect 100-continue with a 400 - + -H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 999 diff --git a/tests/data/test1132 b/tests/data/test1132 index 8aa643224d..613031bac8 100644 --- a/tests/data/test1132 +++ b/tests/data/test1132 @@ -13,9 +13,9 @@ memory-includes none - + Verify memory #include files in libcurl's C source files - + %SRCDIR/mem-include-scan.pl %SRCDIR/../lib diff --git a/tests/data/test1133 b/tests/data/test1133 index 51b6471737..9582fc4d08 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -25,10 +25,10 @@ Mime http - + HTTP RFC1867-type formposting with filename/data contains ',', ';', '"' - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"%LOGDIR/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER,and;.txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER,and;.txt";type=m/f,"%LOGDIR/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b' # We create this file before the command is invoked! diff --git a/tests/data/test1134 b/tests/data/test1134 index 199622fe8f..09aea52243 100644 --- a/tests/data/test1134 +++ b/tests/data/test1134 @@ -34,10 +34,10 @@ contents2 http - + HTTP connection reuse with different credentials - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u 2user:password2 diff --git a/tests/data/test1135 b/tests/data/test1135 index 17191feba3..d188989ed6 100644 --- a/tests/data/test1135 +++ b/tests/data/test1135 @@ -17,9 +17,9 @@ none # the build. We break binary compatibility by changing order. Only add # new entries last or bump the SONAME. # - + Verify CURL_EXTERN order - + %SRCDIR/extern-scan.pl %SRCDIR/.. diff --git a/tests/data/test1137 b/tests/data/test1137 index aa37325a77..cb20aee313 100644 --- a/tests/data/test1137 +++ b/tests/data/test1137 @@ -27,10 +27,10 @@ REPLY EPSV 500 no such command ftp - + FTP RETR --ignore-content-length - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length diff --git a/tests/data/test1138 b/tests/data/test1138 index c982583946..9afe8d7fbd 100644 --- a/tests/data/test1138 +++ b/tests/data/test1138 @@ -45,10 +45,10 @@ body http - + HTTP redirect with UTF-8 characters - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test114 b/tests/data/test114 index 8d8cc86b19..8a545f2a85 100644 --- a/tests/data/test114 +++ b/tests/data/test114 @@ -17,10 +17,10 @@ REPLY PASS 314 bluah you f00l! ftp - + FTP download, failed login: PASS not valid - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1140 b/tests/data/test1140 index f083eec391..5aa997e789 100644 --- a/tests/data/test1140 +++ b/tests/data/test1140 @@ -14,9 +14,9 @@ documentation none - + Verify the nroff of man pages - + %SRCDIR/nroff-scan.pl %SRCDIR/../docs/ %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 %SRCDIR/../docs/*.1 diff --git a/tests/data/test1141 b/tests/data/test1141 index 97faec45c4..727cbcd565 100644 --- a/tests/data/test1141 +++ b/tests/data/test1141 @@ -41,10 +41,10 @@ hej http - + HTTP redirect to http:/// (three slashes!) - - + + %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1142 b/tests/data/test1142 index b8dc33e475..c35190006f 100644 --- a/tests/data/test1142 +++ b/tests/data/test1142 @@ -36,10 +36,10 @@ Location: http:////foo.example.com/want/%TESTNUMBER0001 http - + HTTP redirect to http://// (four slashes!) - - + + %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1143 b/tests/data/test1143 index a3b97402ee..e9053b1794 100644 --- a/tests/data/test1143 +++ b/tests/data/test1143 @@ -22,10 +22,10 @@ hej http - + HTTP URL with http:/ (one slash!) - - + + http:/%HOSTIP:%HTTPPORT/want/%TESTNUMBER diff --git a/tests/data/test1144 b/tests/data/test1144 index 7e2242be86..1881a5190b 100644 --- a/tests/data/test1144 +++ b/tests/data/test1144 @@ -47,10 +47,10 @@ verify http - + HTTP HEAD, receive no headers only body - - + + -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test1147 b/tests/data/test1147 index 81c33a8c88..a85aeddb9c 100644 --- a/tests/data/test1147 +++ b/tests/data/test1147 @@ -32,9 +32,9 @@ Funny-head: yesyes http - + Get -H headers from a file - + One: 1 Two: 2 @@ -45,7 +45,7 @@ no-colon %endif User-Agent: - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test1148 b/tests/data/test1148 index dbd25921a6..f5333534a0 100644 --- a/tests/data/test1148 +++ b/tests/data/test1148 @@ -31,10 +31,10 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz http - + progress-bar - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER diff --git a/tests/data/test1149 b/tests/data/test1149 index ac4d1c10f9..7686ef10b9 100644 --- a/tests/data/test1149 +++ b/tests/data/test1149 @@ -33,10 +33,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir list multicwd then again nocwd - - + + ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method nocwd diff --git a/tests/data/test115 b/tests/data/test115 index 869027884d..22f75c0b6e 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -19,10 +19,10 @@ REPLY EPSV 314 bluah you f00l! ftp - + FTP download, failed PASV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1150 b/tests/data/test1150 index 6a07b73dfb..cafc00cd07 100644 --- a/tests/data/test1150 +++ b/tests/data/test1150 @@ -26,10 +26,10 @@ daniel http - + HTTP proxy with URLs using different ports - - + + --proxy http://%HOSTIP:%HTTPPORT http://test.remote.example.com.%TESTNUMBER:150/path http://test.remote.example.com.%TESTNUMBER:1234/path/ diff --git a/tests/data/test1151 b/tests/data/test1151 index bb24d1b133..2da611ebfa 100644 --- a/tests/data/test1151 +++ b/tests/data/test1151 @@ -35,10 +35,10 @@ Set-Cookie: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF http - + HTTP with too long cookies - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt diff --git a/tests/data/test1152 b/tests/data/test1152 index 870215d9ff..490fde3b74 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -36,10 +36,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP with uneven quote in PWD response - - + + ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ diff --git a/tests/data/test1153 b/tests/data/test1153 index b481431328..36c76693ac 100644 --- a/tests/data/test1153 +++ b/tests/data/test1153 @@ -36,10 +36,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP with quoted double quotes - - + + ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ diff --git a/tests/data/test1154 b/tests/data/test1154 index ab1addec6b..b7349e17d2 100644 --- a/tests/data/test1154 +++ b/tests/data/test1154 @@ -29,10 +29,10 @@ Long: %repeat[102400 x A]% http - + HTTP GET with 100K (too long) response header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1155 b/tests/data/test1155 index dbaf344e9f..579328d925 100644 --- a/tests/data/test1155 +++ b/tests/data/test1155 @@ -24,10 +24,10 @@ Set-Cookie: domain=value;path=/ http - + HTTP cookie with parameter word as name - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt diff --git a/tests/data/test1156 b/tests/data/test1156 index d638274b5f..94fa469dce 100644 --- a/tests/data/test1156 +++ b/tests/data/test1156 @@ -54,10 +54,10 @@ http lib%TESTNUMBER - + HTTP resume/range fail range-error content-range combinations - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER diff --git a/tests/data/test1157 b/tests/data/test1157 index 53f1b9963e..4e246e7031 100644 --- a/tests/data/test1157 +++ b/tests/data/test1157 @@ -32,12 +32,12 @@ Funny-head: yesyes http - + Get -H headers from empty file - + - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test1159 b/tests/data/test1159 index b09aff0e33..6ef2e4ad66 100644 --- a/tests/data/test1159 +++ b/tests/data/test1159 @@ -26,9 +26,9 @@ This server reply is for testing a simple Location: following http - + HTTP Location: and 'redirect_url' with non-supported scheme - + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' diff --git a/tests/data/test116 b/tests/data/test116 index f05c1bd2f5..37aed2ceb2 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -25,10 +25,10 @@ ftp ipv6 - + FTP download, failed PORT - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4 diff --git a/tests/data/test1160 b/tests/data/test1160 index e6835987e7..0e946b34bf 100644 --- a/tests/data/test1160 +++ b/tests/data/test1160 @@ -25,10 +25,10 @@ Set-Cookie: ____________ http - + HTTP with long funny format cookie - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt diff --git a/tests/data/test1161 b/tests/data/test1161 index 3b1a2fd191..dd8f9c9ebf 100644 --- a/tests/data/test1161 +++ b/tests/data/test1161 @@ -24,10 +24,10 @@ Set-Cookie: ckyPersistent=permanent;path=;path=/ http - + HTTP cookie with path set twice - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt diff --git a/tests/data/test1164 b/tests/data/test1164 index aedd6c97d4..d16b98bbf7 100644 --- a/tests/data/test1164 +++ b/tests/data/test1164 @@ -29,9 +29,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== http - + HTTP/0.9 GET and all zeroes - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9 diff --git a/tests/data/test1165 b/tests/data/test1165 index 24c1c3eb13..de4283af22 100644 --- a/tests/data/test1165 +++ b/tests/data/test1165 @@ -13,9 +13,9 @@ CURL_DISABLE none - + Verify configure.ac and source code CURL_DISABLE_-sync - + %SRCDIR/disable-scan.pl %SRCDIR/.. diff --git a/tests/data/test1166 b/tests/data/test1166 index 609939f296..92e8ff4046 100644 --- a/tests/data/test1166 +++ b/tests/data/test1166 @@ -26,10 +26,10 @@ This server reply is for testing a Location: following with cookies http - + HTTP response with cookies but not receiving! - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER diff --git a/tests/data/test1167 b/tests/data/test1167 index 9eebe1c4e8..3c2fb1a5f1 100644 --- a/tests/data/test1167 +++ b/tests/data/test1167 @@ -12,9 +12,9 @@ source analysis none - + Verify curl prefix of public symbols in header files - + %SRCDIR/badsymbols.pl %SRCDIR/.. diff --git a/tests/data/test1168 b/tests/data/test1168 index 5d0ed3a671..13dd566179 100644 --- a/tests/data/test1168 +++ b/tests/data/test1168 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + HTTP redirect with credentials using # in user and password - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY" diff --git a/tests/data/test117 b/tests/data/test117 index b9c4b2ebad..3bd5cb57f1 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -18,10 +18,10 @@ REPLY TYPE 314 bluah you f00l! ftp - + FTP download, failed TYPE - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1170 b/tests/data/test1170 index fd718f32ce..16dc6908df 100644 --- a/tests/data/test1170 +++ b/tests/data/test1170 @@ -43,10 +43,10 @@ libz http - + HTTP GET transfer-encoding with removed Connection: - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:" diff --git a/tests/data/test1171 b/tests/data/test1171 index e66f87cf95..d866c75a22 100644 --- a/tests/data/test1171 +++ b/tests/data/test1171 @@ -43,10 +43,10 @@ libz http - + HTTP GET transfer-encoding with blanked Connection: - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;" diff --git a/tests/data/test1172 b/tests/data/test1172 index 53179623d4..0de4713d39 100644 --- a/tests/data/test1172 +++ b/tests/data/test1172 @@ -22,10 +22,10 @@ HTTP/0.9 http - + HTTP/0.9 GET response denied - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9 diff --git a/tests/data/test1173 b/tests/data/test1173 index f52afa6bbc..b5dafbb3b8 100644 --- a/tests/data/test1173 +++ b/tests/data/test1173 @@ -14,9 +14,9 @@ documentation none - + Man page syntax checks - + %SRCDIR/manpage-syntax.pl %SRCDIR/../docs/libcurl/symbols-in-versions %SRCDIR/../docs/*.1 %SRCDIR/../docs/libcurl/*.3 %SRCDIR/../docs/libcurl/opts/*.3 diff --git a/tests/data/test1174 b/tests/data/test1174 index 5f45bb8622..48938a7be3 100644 --- a/tests/data/test1174 +++ b/tests/data/test1174 @@ -22,10 +22,10 @@ HTTP/0.9 http - + HTTP/0.9 GET response denied by default - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1175 b/tests/data/test1175 index 61f0689154..5190dbe2ac 100644 --- a/tests/data/test1175 +++ b/tests/data/test1175 @@ -13,9 +13,9 @@ symbols-in-versions none - + Verify that symbols-in-versions and libcurl-errors.3 are in sync - + %SRCDIR/error-codes.pl %SRCDIR diff --git a/tests/data/test1176 b/tests/data/test1176 index 9ad1150f19..86d23a2ccc 100644 --- a/tests/data/test1176 +++ b/tests/data/test1176 @@ -30,9 +30,9 @@ Funny-head: yesyes http - + --output using #0 - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0' diff --git a/tests/data/test1177 b/tests/data/test1177 index 29ddf3f877..66fe49767b 100644 --- a/tests/data/test1177 +++ b/tests/data/test1177 @@ -13,9 +13,9 @@ CURL_VERSION none - + Verify that feature names and CURL_VERSION_* in lib and docs are in sync - + %SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h %SRCDIR/../lib/version.c diff --git a/tests/data/test1178 b/tests/data/test1178 index f8fa1ca1cb..db6a745e6f 100644 --- a/tests/data/test1178 +++ b/tests/data/test1178 @@ -25,11 +25,11 @@ Funny-head: yesyes http - + HTTP proxy auth with credentials longer than 256 bytes - + # 400 x 'A' : 600 x 'B' ... - + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB diff --git a/tests/data/test118 b/tests/data/test118 index 4d47282af9..9b5b8708eb 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -21,10 +21,10 @@ REPLY SIZE 500 command not understood ftp - + FTP download, failed RETR - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1180 b/tests/data/test1180 index 1eb9ed69b6..d04542ef96 100644 --- a/tests/data/test1180 +++ b/tests/data/test1180 @@ -27,10 +27,10 @@ http proxy - + HTTP GET request with proxy and -H "Proxy-Connection: keep-alive" - - + + --proxy http://%HOSTIP:%HTTPPORT -H "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1181 b/tests/data/test1181 index 367265c802..8f744669ee 100644 --- a/tests/data/test1181 +++ b/tests/data/test1181 @@ -27,10 +27,10 @@ http proxy - + HTTP GET request with proxy and --proxy-header "Proxy-Connection: Keep-Alive" - - + + --proxy http://%HOSTIP:%HTTPPORT --proxy-header "Proxy-Connection: Keep-Alive" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1183 b/tests/data/test1183 index 2955bdcc49..5f795ed666 100644 --- a/tests/data/test1183 +++ b/tests/data/test1183 @@ -27,10 +27,10 @@ http proxy - + %TESTNUMBER used instead of actual test number - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1184 b/tests/data/test1184 index feac348ef5..268da350fb 100644 --- a/tests/data/test1184 +++ b/tests/data/test1184 @@ -45,10 +45,10 @@ second http http-proxy - + HTTP 1.1 CONNECT with redirect and set -H user-agent - - + + -x %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -L -H "User-Agent: %TESTNUMBER-agent" diff --git a/tests/data/test1187 b/tests/data/test1187 index cc09564a5d..aaa8d107b3 100644 --- a/tests/data/test1187 +++ b/tests/data/test1187 @@ -20,16 +20,16 @@ Mime smtp - + SMTP multipart with file name escaping - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=This is the mail text" -F '=File content;filename="strange\file\"name"' diff --git a/tests/data/test1188 b/tests/data/test1188 index 0cbaaeb04f..702856245d 100644 --- a/tests/data/test1188 +++ b/tests/data/test1188 @@ -22,9 +22,9 @@ Connection: close http - + --write-out with %{onerror} and %{urlnum} to stderr - + -f -s -w '%{onerror}%{stderr}%{urlnum} says %{exitcode} %{errormsg}\n' http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER diff --git a/tests/data/test1189 b/tests/data/test1189 index 27e35c41ee..0c19e70f77 100644 --- a/tests/data/test1189 +++ b/tests/data/test1189 @@ -25,10 +25,10 @@ Mime http - + Multipart formposting with backslash-escaping of name= and filename= - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2= # We create this file before the command is invoked! diff --git a/tests/data/test119 b/tests/data/test119 index 6999e0da70..4426def0bd 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood ftp - + FTP download, failed RETR with PORT - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1197 b/tests/data/test1197 index 8b882c714c..22bf8dbbe8 100644 --- a/tests/data/test1197 +++ b/tests/data/test1197 @@ -39,10 +39,10 @@ bigger monster http - + HTTP POST redirected to GET and --write-out method - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle little star" diff --git a/tests/data/test12 b/tests/data/test12 index a7c30d220b..48380a1e9b 100644 --- a/tests/data/test12 +++ b/tests/data/test12 @@ -32,10 +32,10 @@ in the request http - + HTTP range support - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200 diff --git a/tests/data/test120 b/tests/data/test120 index 45e11a63e5..64628b6599 100644 --- a/tests/data/test120 +++ b/tests/data/test120 @@ -27,10 +27,10 @@ REPLY EPSV 314 bluah you f00l! ftp - + ftp download with post-quote delete operation - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file" diff --git a/tests/data/test1200 b/tests/data/test1200 index 886fa166f2..342077b8a5 100644 --- a/tests/data/test1200 +++ b/tests/data/test1200 @@ -21,10 +21,10 @@ iMenu results error.host 1 gopher - + Gopher index - - + + gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER diff --git a/tests/data/test1201 b/tests/data/test1201 index 9f1ba664b2..296e7fa6a0 100644 --- a/tests/data/test1201 +++ b/tests/data/test1201 @@ -21,10 +21,10 @@ iMenu results error.host 1 gopher - + Gopher selector - - + + gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER? diff --git a/tests/data/test1202 b/tests/data/test1202 index aefb6d0082..ab1d51c0f8 100644 --- a/tests/data/test1202 +++ b/tests/data/test1202 @@ -22,10 +22,10 @@ iSearch results error.host 1 gopher - + Gopher query - - + + "gopher://%HOSTIP:%GOPHERPORT/7/the/search/engine%09query%20succeeded/%TESTNUMBER" diff --git a/tests/data/test1203 b/tests/data/test1203 index 9f4648e272..b4c70e9cbc 100644 --- a/tests/data/test1203 +++ b/tests/data/test1203 @@ -25,10 +25,10 @@ ipv6 gopher-ipv6 - + Gopher IPv6 index - - + + -g gopher://%HOST6IP:%GOPHER6PORT/1/moo/%TESTNUMBER diff --git a/tests/data/test1204 b/tests/data/test1204 index 9e8c2b6a03..0aac591b71 100644 --- a/tests/data/test1204 +++ b/tests/data/test1204 @@ -51,10 +51,10 @@ This IS the real page! http - + HTTP with WWW-Authenticate and multiple auths in a single line - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1205 b/tests/data/test1205 index df77175d64..5a7fb7dc51 100644 --- a/tests/data/test1205 +++ b/tests/data/test1205 @@ -26,10 +26,10 @@ Funny-head: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA http - + HTTP GET with 18K HTTP header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1206 b/tests/data/test1206 index 453b991084..228df4adb7 100644 --- a/tests/data/test1206 +++ b/tests/data/test1206 @@ -22,10 +22,10 @@ NODATACONN425 ftp - + FTP PORT and 425 on download - - + + --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1207 b/tests/data/test1207 index f105df54c0..612c42b0d6 100644 --- a/tests/data/test1207 +++ b/tests/data/test1207 @@ -22,10 +22,10 @@ NODATACONN421 ftp - + FTP PORT and 421 on download - - + + --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1208 b/tests/data/test1208 index 57937a9672..055a0a58c6 100644 --- a/tests/data/test1208 +++ b/tests/data/test1208 @@ -26,10 +26,10 @@ NODATACONN150 ftp - + FTP PORT download, no data conn and no transient negative reply - - + + --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1209 b/tests/data/test1209 index 8a4f1f85d7..38e1003c90 100644 --- a/tests/data/test1209 +++ b/tests/data/test1209 @@ -24,10 +24,10 @@ NODATACONN ftp - + FTP PORT download, no data conn and no positive preliminary reply - - + + --max-time %FTPTIME2 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test121 b/tests/data/test121 index b8ec70136c..3625d0e3e0 100644 --- a/tests/data/test121 +++ b/tests/data/test121 @@ -25,10 +25,10 @@ works ftp - + ftp download with post- and pre-transfer delete operations - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_transfer" diff --git a/tests/data/test1211 b/tests/data/test1211 index 072aede023..6ca7eaea91 100644 --- a/tests/data/test1211 +++ b/tests/data/test1211 @@ -24,10 +24,10 @@ NODATACONN425 ftp - + FTP PORT and 425 on download - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1212 b/tests/data/test1212 index d445f93763..56b189c9de 100644 --- a/tests/data/test1212 +++ b/tests/data/test1212 @@ -29,9 +29,9 @@ proxy http - + noproxy setting together with socks proxy - + http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-host.haxx.se:1080 --noproxy %HOSTIP --max-time 5 diff --git a/tests/data/test1213 b/tests/data/test1213 index 6bd4d2c362..195329ecb2 100644 --- a/tests/data/test1213 +++ b/tests/data/test1213 @@ -26,13 +26,13 @@ the content goes here http - + HTTP with proxy and host-only URL - + # the thing here is that this sloppy form is accepted and we convert it # for normal server use, and we need to make sure it gets converted to # RFC style even for proxies - + -x %HOSTIP:%HTTPPORT we.want.that.site.com.%TESTNUMBER diff --git a/tests/data/test1214 b/tests/data/test1214 index 1758693971..fc8a94eaf7 100644 --- a/tests/data/test1214 +++ b/tests/data/test1214 @@ -26,13 +26,13 @@ the content goes here http - + HTTP with proxy and URL with ? and no slash separator - + # the thing here is that this sloppy form is accepted and we convert it # for normal server use, and we need to make sure it gets converted to # RFC style even for proxies - + -x %HOSTIP:%HTTPPORT http://we.want.that.site.com.%TESTNUMBER?moo=foo diff --git a/tests/data/test1216 b/tests/data/test1216 index 768c39e66d..6341ba473c 100644 --- a/tests/data/test1216 +++ b/tests/data/test1216 @@ -27,10 +27,10 @@ This server says moo http - + HTTP cookie domains tailmatching the host name - - + + http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test1217 b/tests/data/test1217 index 0f4772d970..691c88e732 100644 --- a/tests/data/test1217 +++ b/tests/data/test1217 @@ -22,10 +22,10 @@ REPLY PWD 257 there is rubbish all over "/this/is/the/path" ftp - + FTP with rubbish before name in 257-response - - + + ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/again/%TESTNUMBER --ftp-method singlecwd diff --git a/tests/data/test1218 b/tests/data/test1218 index e176c47fa3..afbc2b5646 100644 --- a/tests/data/test1218 +++ b/tests/data/test1218 @@ -26,10 +26,10 @@ This server says moo http - + HTTP cookies and domains with same prefix - - + + http://example.fake/c/%TESTNUMBER http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b nonexisting -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test1219 b/tests/data/test1219 index f579859fda..454654399b 100644 --- a/tests/data/test1219 +++ b/tests/data/test1219 @@ -26,10 +26,10 @@ REPLY welcome 230 welcome without password ftp - + FTP with no user+password required (230 response) - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test122 b/tests/data/test122 index 8d636af478..1f007c1ce0 100644 --- a/tests/data/test122 +++ b/tests/data/test122 @@ -21,10 +21,10 @@ REPLY EPSV 500 no such command ftp - + FTP download resume with whole file already downloaded - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5 diff --git a/tests/data/test1220 b/tests/data/test1220 index d7e2ff9424..38e5b8876c 100644 --- a/tests/data/test1220 +++ b/tests/data/test1220 @@ -17,9 +17,9 @@ URL file - + file:// URLs with query string - + file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt?a_query=foobar#afragment diff --git a/tests/data/test1221 b/tests/data/test1221 index 42617e85b0..c2fd7a5ddd 100644 --- a/tests/data/test1221 +++ b/tests/data/test1221 @@ -25,10 +25,10 @@ Content-Length: 0 http - + --url-query with --data-urlencode - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --url-query "my name is moo[]" --url-query "yes=s i r" --url-query "v_alue@%LOGDIR/%TESTNUMBER.txt" --url-query @%LOGDIR/%TESTNUMBER.txt --url-query "+%3d%3d" --data-urlencode "start=once upon the time" diff --git a/tests/data/test1222 b/tests/data/test1222 index e65b514ea2..b56cf6879a 100644 --- a/tests/data/test1222 +++ b/tests/data/test1222 @@ -12,9 +12,9 @@ source analysis none - + Verify deprecation statuses and versions - + %SRCDIR/check-deprecated.pl %SRCDIR/.. diff --git a/tests/data/test1223 b/tests/data/test1223 index 9404adf6f2..6c1ee00189 100644 --- a/tests/data/test1223 +++ b/tests/data/test1223 @@ -26,10 +26,10 @@ hej http - + HTTP GET -w remote_ip and -w remote_port - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}\n' diff --git a/tests/data/test1224 b/tests/data/test1224 index fc898a7a19..64ba4482c5 100644 --- a/tests/data/test1224 +++ b/tests/data/test1224 @@ -23,10 +23,10 @@ works ftp - + FTP fetch a file from the root directory - - + + ftp://%HOSTIP:%FTPPORT//%TESTNUMBER diff --git a/tests/data/test1225 b/tests/data/test1225 index 7e4f39b010..b20363c3e4 100644 --- a/tests/data/test1225 +++ b/tests/data/test1225 @@ -23,10 +23,10 @@ works ftp - + FTP fetch two files using absolute paths - - + + ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUMBER diff --git a/tests/data/test1226 b/tests/data/test1226 index a22776eac7..08e706b9b0 100644 --- a/tests/data/test1226 +++ b/tests/data/test1226 @@ -23,10 +23,10 @@ works ftp - + FTP fetch a file from the root directory with singlecwd - - + + ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd diff --git a/tests/data/test1227 b/tests/data/test1227 index 1cd9bf24fa..30477a46a0 100644 --- a/tests/data/test1227 +++ b/tests/data/test1227 @@ -23,10 +23,10 @@ works ftp - + FTP fetch a file from the root directory with nocwd - - + + ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd diff --git a/tests/data/test1228 b/tests/data/test1228 index d33b742892..a4df51c46c 100644 --- a/tests/data/test1228 +++ b/tests/data/test1228 @@ -25,10 +25,10 @@ This server says cookie path test http - + HTTP cookie path match - - + + http://example.fake/hoge/%TESTNUMBER http://example.fake/hogege/ -b nonexisting -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test1229 b/tests/data/test1229 index 06d81758e9..96cdbfe133 100644 --- a/tests/data/test1229 +++ b/tests/data/test1229 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with Digest authorization with user name needing escape - - + + http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest diff --git a/tests/data/test123 b/tests/data/test123 index 21d3b58ae1..8ccd69cf68 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -15,10 +15,10 @@ Resume ftp - + FTP upload resume with whole file already downloaded - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51 diff --git a/tests/data/test1230 b/tests/data/test1230 index ef841d0951..5cdf1643fe 100644 --- a/tests/data/test1230 +++ b/tests/data/test1230 @@ -50,11 +50,11 @@ http-proxy http-ipv6 http - + HTTP CONNECT to IPv6 numerical address - + # 0x4ce == %TESTNUMBER, the test number - + http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test1231 b/tests/data/test1231 index c37f50915d..2c7c8bb000 100644 --- a/tests/data/test1231 +++ b/tests/data/test1231 @@ -33,10 +33,10 @@ Connection: close http - + HTTP URL with dotdot removal from path - - + + http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001 diff --git a/tests/data/test1232 b/tests/data/test1232 index b62a07d166..28d2eee735 100644 --- a/tests/data/test1232 +++ b/tests/data/test1232 @@ -35,10 +35,10 @@ Connection: close http - + HTTP URL with dotdot removal from path using an HTTP proxy - - + + --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001 diff --git a/tests/data/test1233 b/tests/data/test1233 index b5dedca09a..79e641d368 100644 --- a/tests/data/test1233 +++ b/tests/data/test1233 @@ -22,10 +22,10 @@ here are some bytes ftp - + FTP failing to connect to EPSV port, switching to PASV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1234 b/tests/data/test1234 index c20b3b4a3b..5676a809cd 100644 --- a/tests/data/test1234 +++ b/tests/data/test1234 @@ -15,10 +15,10 @@ FAILURE none - + abusing {}-globbing - - + + "%HOSTIP:%NOLISTENPORT/%TESTNUMBER[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{" diff --git a/tests/data/test1235 b/tests/data/test1235 index 24e7f73919..56664f3f0e 100644 --- a/tests/data/test1235 +++ b/tests/data/test1235 @@ -30,10 +30,10 @@ two is nice too http - + multiple requests using {}{} in the URL - - + + "%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}{0001,0002}" diff --git a/tests/data/test1236 b/tests/data/test1236 index 7408a7bae0..286bb0a02f 100644 --- a/tests/data/test1236 +++ b/tests/data/test1236 @@ -14,11 +14,11 @@ FAILURE none - + [] globbing overflowing the range counter - + # 2^62 == 4611686018427387904 - + "%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/[1-4611686018427387904][1-4611686018427387904]" diff --git a/tests/data/test1237 b/tests/data/test1237 index 8e9590e24e..7e49f830d1 100644 --- a/tests/data/test1237 +++ b/tests/data/test1237 @@ -23,10 +23,10 @@ Content-Type: text/html http - + URL with 1000+ letter user name + password - - + + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB@%HOSTIP:%HTTPPORT/%TESTNUMBER" diff --git a/tests/data/test1238 b/tests/data/test1238 index 3e36fbfcca..49b9e65e57 100644 --- a/tests/data/test1238 +++ b/tests/data/test1238 @@ -35,11 +35,11 @@ tftp tftp - + slow TFTP retrieve cancel due to -Y and -y - + # if less than 1000 bytes/sec within 2 seconds, abort! - + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2 diff --git a/tests/data/test1239 b/tests/data/test1239 index 1679ce5b32..601f45459d 100644 --- a/tests/data/test1239 +++ b/tests/data/test1239 @@ -30,10 +30,10 @@ Content-Type: text/html http - + HTTP with -z + -w response_code and simulated 304 - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code}' diff --git a/tests/data/test124 b/tests/data/test124 index f21c28f05b..d2717949c9 100644 --- a/tests/data/test124 +++ b/tests/data/test124 @@ -22,10 +22,10 @@ REPLY EPSV 314 bluah you f00l! ftp - + FTP download, failed PWD - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1240 b/tests/data/test1240 index 11a7e0f894..5e99f8aff0 100644 --- a/tests/data/test1240 +++ b/tests/data/test1240 @@ -21,10 +21,10 @@ Connection: close http - + glob [0-1] with stuff after range (7.33.0 regression) - - + + "%HOSTIP:%HTTPPORT/0[0-1]/%TESTNUMBER" diff --git a/tests/data/test1241 b/tests/data/test1241 index 952fa2355f..e114ad326a 100644 --- a/tests/data/test1241 +++ b/tests/data/test1241 @@ -34,10 +34,10 @@ Connection: close http - + HTTP _without_ dotdot removal - - + + --path-as-is --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER#soo/../%TESTNUMBER http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001#/../%TESTNUMBER0001 diff --git a/tests/data/test1242 b/tests/data/test1242 index 61938a0417..03d527c328 100644 --- a/tests/data/test1242 +++ b/tests/data/test1242 @@ -23,10 +23,10 @@ returned tftp - + TFTP retrieve without TFTP options requests - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options diff --git a/tests/data/test1243 b/tests/data/test1243 index 7f71631917..4a8daf5841 100644 --- a/tests/data/test1243 +++ b/tests/data/test1243 @@ -12,10 +12,10 @@ TFTP WRQ tftp - + TFTP send without TFTP options requests - - + + -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options diff --git a/tests/data/test1246 b/tests/data/test1246 index 4cb0c3a16e..7723192fa1 100644 --- a/tests/data/test1246 +++ b/tests/data/test1246 @@ -34,10 +34,10 @@ Connection: close http - + URL with '#' at end of host name instead of '/' - - + + --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT#@127.0.0.1/tricked.html no-scheme-url.com.%TESTNUMBER:%HTTPPORT#@127.127.127.127/again.html diff --git a/tests/data/test1247 b/tests/data/test1247 index 02c695cd6d..917deac3ee 100644 --- a/tests/data/test1247 +++ b/tests/data/test1247 @@ -19,10 +19,10 @@ HTTP http - + --fail-early - - + + --fail-early h1234://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test125 b/tests/data/test125 index 39b2b32ce7..8de97c14e5 100644 --- a/tests/data/test125 +++ b/tests/data/test125 @@ -17,10 +17,10 @@ REPLY CWD 314 bluah you f00l! ftp - + FTP download, failed CWD - - + + ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER diff --git a/tests/data/test1258 b/tests/data/test1258 index 5a4ce0b73b..ae4a33e4b2 100644 --- a/tests/data/test1258 +++ b/tests/data/test1258 @@ -26,10 +26,10 @@ boo http - + HTTP, use cookies with localhost - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga -b non-existing -H "Host: localhost" diff --git a/tests/data/test1259 b/tests/data/test1259 index 4e0c6d495f..3ef77ac81e 100644 --- a/tests/data/test1259 +++ b/tests/data/test1259 @@ -23,10 +23,10 @@ boo http - + HTTP URL with semicolon in password - - + + "http://user:pass;word@%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER" diff --git a/tests/data/test126 b/tests/data/test126 index f1b2527343..b830fc7781 100644 --- a/tests/data/test126 +++ b/tests/data/test126 @@ -22,10 +22,10 @@ RETRWEIRDO ftp - + FTP download with multiple replies at once in RETR - - + + ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER diff --git a/tests/data/test1260 b/tests/data/test1260 index cff79e2988..11cc13dfc9 100644 --- a/tests/data/test1260 +++ b/tests/data/test1260 @@ -18,10 +18,10 @@ none http - + HTTP URL with rubbish after port number - - + + -g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://%HOSTIP:%NOLISTENPORT:80/we/want/%TESTNUMBER" "http://user@example.com:80@localhost" diff --git a/tests/data/test1261 b/tests/data/test1261 index 0fc3833a0b..17a8af82c0 100644 --- a/tests/data/test1261 +++ b/tests/data/test1261 @@ -26,10 +26,10 @@ This server reply is for testing a simple Location: following http - + 'redirect_url' with --location and --max-redirs - - + + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --location --max-redirs 0 diff --git a/tests/data/test1262 b/tests/data/test1262 index 63abe8b8f0..0a7046ce93 100644 --- a/tests/data/test1262 +++ b/tests/data/test1262 @@ -19,10 +19,10 @@ RETR ftp - + FTP request and denied to download an older file with -z - - + + ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001" diff --git a/tests/data/test1263 b/tests/data/test1263 index ef42f20e02..bed3b35ef5 100644 --- a/tests/data/test1263 +++ b/tests/data/test1263 @@ -19,10 +19,10 @@ none http - + HTTP URL with rubbish after IPv6 bracket - - + + -g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/%TESTNUMBER" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/%TESTNUMBER" "http://user@[::1]@localhost" diff --git a/tests/data/test1264 b/tests/data/test1264 index 54fb6ffa30..e9ae4b5086 100644 --- a/tests/data/test1264 +++ b/tests/data/test1264 @@ -18,10 +18,10 @@ none http - + HTTP URL with space in host name - - + + -g "http://127.0.0.1 www.example.com/we/want/%TESTNUMBER" diff --git a/tests/data/test1266 b/tests/data/test1266 index 2e72ae4862..913c96cd55 100644 --- a/tests/data/test1266 +++ b/tests/data/test1266 @@ -26,10 +26,10 @@ swsclose http - + HTTP GET with a single-byte HTTP/0.9 response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test1267 b/tests/data/test1267 index 920fc577f1..11b53650cb 100644 --- a/tests/data/test1267 +++ b/tests/data/test1267 @@ -26,10 +26,10 @@ swsclose http - + HTTP GET with a invalid HTTP/1 response line start - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test1268 b/tests/data/test1268 index 257b4726ed..806592fb89 100644 --- a/tests/data/test1268 +++ b/tests/data/test1268 @@ -19,10 +19,10 @@ none unix-sockets - + file name argument looks like a flag - - + + --stderr %LOGDIR/moo%TESTNUMBER --unix-socket -k hej://moo diff --git a/tests/data/test1269 b/tests/data/test1269 index f68cf9c09b..6cc68e0f00 100644 --- a/tests/data/test1269 +++ b/tests/data/test1269 @@ -16,10 +16,10 @@ none - + too large --retry-delay value - - + + --retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER diff --git a/tests/data/test127 b/tests/data/test127 index 0b0f4f5983..ebf122d018 100644 --- a/tests/data/test127 +++ b/tests/data/test127 @@ -19,10 +19,10 @@ moooooooo ftp - + FTP --disable-epsv - - + + ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv diff --git a/tests/data/test1270 b/tests/data/test1270 index 0c289d0cff..1e1fa67bb5 100644 --- a/tests/data/test1270 +++ b/tests/data/test1270 @@ -31,10 +31,10 @@ Connection: close http - + Basic 'redirect_url' - - + + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s diff --git a/tests/data/test1271 b/tests/data/test1271 index 2d412a6bf7..3cc994b716 100644 --- a/tests/data/test1271 +++ b/tests/data/test1271 @@ -23,10 +23,10 @@ Moo http - + --write-out from file with empty file - - + + http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER diff --git a/tests/data/test1272 b/tests/data/test1272 index 39c62901e2..9212428927 100644 --- a/tests/data/test1272 +++ b/tests/data/test1272 @@ -25,10 +25,10 @@ gophers gophers - + Gophers index - - + + -k gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER diff --git a/tests/data/test1273 b/tests/data/test1273 index d724fdd843..fb5d47b2d4 100644 --- a/tests/data/test1273 +++ b/tests/data/test1273 @@ -47,10 +47,10 @@ http http - + -f and resume transfer of an entirely-downloaded file - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f diff --git a/tests/data/test1274 b/tests/data/test1274 index 5198537876..db37f656d6 100644 --- a/tests/data/test1274 +++ b/tests/data/test1274 @@ -32,10 +32,10 @@ Connection: http - + HTTP header line folding - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER diff --git a/tests/data/test1276 b/tests/data/test1276 index 2526cdf948..3961bf4cb1 100644 --- a/tests/data/test1276 +++ b/tests/data/test1276 @@ -13,9 +13,9 @@ documentation none - + Verify lib/optiontable.pl - + %SRCDIR/option-check.pl %SRCDIR/.. diff --git a/tests/data/test1277 b/tests/data/test1277 index b705569d06..d80f671fa7 100644 --- a/tests/data/test1277 +++ b/tests/data/test1277 @@ -178,10 +178,10 @@ libz http - + HTTP GET with both content and transfer encoding - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding --compressed diff --git a/tests/data/test1279 b/tests/data/test1279 index b0521052e4..fd3b34bd30 100644 --- a/tests/data/test1279 +++ b/tests/data/test1279 @@ -14,9 +14,9 @@ libcurl.def none - + Verify libcurl.def against CURL_EXTERN declarations - + %SRCDIR/extern-scan.pl --heading=EXPORTS --sort %SRCDIR/.. diff --git a/tests/data/test128 b/tests/data/test128 index e3ed4157bd..d1a5d2acff 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -16,10 +16,10 @@ STOR ftp - + FTP upload with --crlf - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --crlf diff --git a/tests/data/test1280 b/tests/data/test1280 index 3f5bdd5bb7..081cbbe547 100644 --- a/tests/data/test1280 +++ b/tests/data/test1280 @@ -23,10 +23,10 @@ bytes http - + simple [a-d] globbing - - + + http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER diff --git a/tests/data/test1281 b/tests/data/test1281 index f6781d4604..a0bca73eab 100644 --- a/tests/data/test1281 +++ b/tests/data/test1281 @@ -20,10 +20,10 @@ none http - + reject non-numerical port number in URL - - + + http://%HOSTIP:alpha/beta/%TESTNUMBER diff --git a/tests/data/test1282 b/tests/data/test1282 index 76e7a000e3..f57275187f 100644 --- a/tests/data/test1282 +++ b/tests/data/test1282 @@ -21,10 +21,10 @@ ftp GSS-API - + FTP with 633 response before gss initialized - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test129 b/tests/data/test129 index 6da58be2d4..22e071d3e1 100644 --- a/tests/data/test129 +++ b/tests/data/test129 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP/1.2 is rejected - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1292 b/tests/data/test1292 index 8b8806e413..e674bfd89c 100644 --- a/tests/data/test1292 +++ b/tests/data/test1292 @@ -26,10 +26,10 @@ Funny-head: yesyes http - + Replaced internal headers with a blank one - - + + -H "Host;" -H "Accept;" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1293 b/tests/data/test1293 index b4977b8d65..afecfaf2f9 100644 --- a/tests/data/test1293 +++ b/tests/data/test1293 @@ -35,10 +35,10 @@ Mime http - + Multipart formpost to two URLs, the first failing - - + + http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F= diff --git a/tests/data/test1298 b/tests/data/test1298 index 2afefac5d3..cebe4a9f71 100644 --- a/tests/data/test1298 +++ b/tests/data/test1298 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP GET special path with --request-target - - + + --request-target "XXX" "http://%HOSTIP:%HTTPPORT/" -H "Testno: %TESTNUMBER" diff --git a/tests/data/test1299 b/tests/data/test1299 index 7f3e80e0c7..11ac0c41f7 100644 --- a/tests/data/test1299 +++ b/tests/data/test1299 @@ -30,10 +30,10 @@ Funny-head: yesyes http - + Send "OPTIONS *" with --request-target - - + + --request-target '*' -X OPTIONS http://%HOSTIP:%HTTPPORT/ -H "Testno: %TESTNUMBER" diff --git a/tests/data/test13 b/tests/data/test13 index 72dd191007..b8bcf16494 100644 --- a/tests/data/test13 +++ b/tests/data/test13 @@ -21,10 +21,10 @@ blabla custom request result http - + HTTP custom request 'DELETE' - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE diff --git a/tests/data/test130 b/tests/data/test130 index 665d0590f0..d6fed33676 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -33,10 +33,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP (optional .netrc; no user/pass) dir list PASV - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test1300 b/tests/data/test1300 index 1183412130..1c1ec7bf8e 100644 --- a/tests/data/test1300 +++ b/tests/data/test1300 @@ -15,8 +15,8 @@ none unittest - + llist unit tests - + diff --git a/tests/data/test1301 b/tests/data/test1301 index 08b43a8ecc..ad6113e56d 100644 --- a/tests/data/test1301 +++ b/tests/data/test1301 @@ -14,8 +14,8 @@ none lib%TESTNUMBER - + curl_strequal tests - + diff --git a/tests/data/test1302 b/tests/data/test1302 index 9e9039cac6..22102413b3 100644 --- a/tests/data/test1302 +++ b/tests/data/test1302 @@ -15,8 +15,8 @@ none unittest - + base64 encode/decode unit tests - + diff --git a/tests/data/test1303 b/tests/data/test1303 index bb23352df1..2e12ae43ff 100644 --- a/tests/data/test1303 +++ b/tests/data/test1303 @@ -15,8 +15,8 @@ none unittest - + Curl_timeleft unit tests - + diff --git a/tests/data/test1304 b/tests/data/test1304 index a7de1d52fe..da36ed1a03 100644 --- a/tests/data/test1304 +++ b/tests/data/test1304 @@ -16,9 +16,9 @@ none unittest netrc - + netrc parsing unit tests - + %LOGDIR/netrc%TESTNUMBER diff --git a/tests/data/test1305 b/tests/data/test1305 index 7d14aa8491..3765f80a0d 100644 --- a/tests/data/test1305 +++ b/tests/data/test1305 @@ -16,9 +16,9 @@ none unittest - + internal hash create/destroy testing - + %TESTNUMBER diff --git a/tests/data/test1306 b/tests/data/test1306 index 7ed450324d..6588fe7fcd 100644 --- a/tests/data/test1306 +++ b/tests/data/test1306 @@ -16,9 +16,9 @@ none unittest - + internal hash create/add/destroy testing - + unit1305 diff --git a/tests/data/test1307 b/tests/data/test1307 index f0e96bfa01..cf4a4ac1a6 100644 --- a/tests/data/test1307 +++ b/tests/data/test1307 @@ -17,8 +17,8 @@ none unittest ftp - + internal Curl_fnmatch() testing - + diff --git a/tests/data/test1308 b/tests/data/test1308 index bc799883fa..d05e3bdfb1 100644 --- a/tests/data/test1308 +++ b/tests/data/test1308 @@ -19,9 +19,9 @@ form-api none - + formpost unit tests - + %LOGDIR/test-%TESTNUMBER diff --git a/tests/data/test1309 b/tests/data/test1309 index 7005d5f13c..4b86377fb3 100644 --- a/tests/data/test1309 +++ b/tests/data/test1309 @@ -15,9 +15,9 @@ none unittest - + splay unit tests - + diff --git a/tests/data/test131 b/tests/data/test131 index 52bff92d4b..c48931175c 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -34,10 +34,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP (optional .netrc; user/no pass) dir list PASV - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/ diff --git a/tests/data/test1310 b/tests/data/test1310 index f0d47e74ff..12fdbb1580 100644 --- a/tests/data/test1310 +++ b/tests/data/test1310 @@ -61,9 +61,9 @@ debug http - + HTTP with NTLM delegation to winbind helper - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost @@ -78,7 +78,7 @@ CURL_NTLM_LOGDIR=%LOGDIR # set the test number CURL_NTLM_AUTH_TESTNUM=%TESTNUMBER - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:anypasswd --ntlm-wb diff --git a/tests/data/test1314 b/tests/data/test1314 index 343a1c2407..40cd18971c 100644 --- a/tests/data/test1314 +++ b/tests/data/test1314 @@ -50,10 +50,10 @@ moo http - + HTTP Location: following a // prefixed url - - + + http://firstplace.example.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test1315 b/tests/data/test1315 index 22135eb199..94b3c48970 100644 --- a/tests/data/test1315 +++ b/tests/data/test1315 @@ -28,10 +28,10 @@ Mime http - + HTTP RFC1867-type formposting - -F with three files, one with explicit type - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content,%LOGDIR/test%TESTNUMBER.txt' # We create this file before the command is invoked! diff --git a/tests/data/test1316 b/tests/data/test1316 index 935c467984..b6b8a18969 100644 --- a/tests/data/test1316 +++ b/tests/data/test1316 @@ -57,10 +57,10 @@ http-proxy http - + FTP LIST tunneled through HTTP proxy - - + + ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT diff --git a/tests/data/test1318 b/tests/data/test1318 index 0844852e9b..b7cc434eb3 100644 --- a/tests/data/test1318 +++ b/tests/data/test1318 @@ -32,10 +32,10 @@ Content-Length: 0 http - + HTTP with --resolve and same host name using different cases - - + + --resolve MiXeDcAsE.cOm:%HTTPPORT:%HOSTIP http://MiXeDcAsE.cOm:%HTTPPORT/%TESTNUMBER http://mixedcase.com:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test1319 b/tests/data/test1319 index ea11925240..2dd8870955 100644 --- a/tests/data/test1319 +++ b/tests/data/test1319 @@ -52,10 +52,10 @@ http-proxy http proxy - + POP3 fetch tunneled through HTTP proxy - - + + pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:secret diff --git a/tests/data/test132 b/tests/data/test132 index b02d993999..8aa2f7906a 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -33,10 +33,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP (optional .netrc; user/passwd supplied) dir list PASV - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ diff --git a/tests/data/test1320 b/tests/data/test1320 index 7b43382b98..9237ea5722 100644 --- a/tests/data/test1320 +++ b/tests/data/test1320 @@ -29,16 +29,16 @@ http-proxy http proxy - + SMTP send tunneled through HTTP proxy - + From: different To: another body - + smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - -p -x %HOSTIP:%PROXYPORT diff --git a/tests/data/test1321 b/tests/data/test1321 index 88d865e7bb..4fe83fefbb 100644 --- a/tests/data/test1321 +++ b/tests/data/test1321 @@ -48,10 +48,10 @@ http-proxy http proxy - + IMAP FETCH tunneled through HTTP proxy - - + + 'imap://imap.%TESTNUMBER:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret -p -x %HOSTIP:%PROXYPORT diff --git a/tests/data/test1325 b/tests/data/test1325 index dea2b2a116..67b31d58fe 100644 --- a/tests/data/test1325 +++ b/tests/data/test1325 @@ -47,10 +47,10 @@ body http - + HTTP 308-redirect with POST - - + + http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo" diff --git a/tests/data/test1326 b/tests/data/test1326 index 22c49cf472..89e5a79c73 100644 --- a/tests/data/test1326 +++ b/tests/data/test1326 @@ -25,14 +25,14 @@ http telnet - + TELNET to HTTP server - + GET /we/want/%TESTNUMBER HTTP/1.0 - + telnet://%HOSTIP:%HTTPPORT --upload-file - diff --git a/tests/data/test1327 b/tests/data/test1327 index 5941e5005e..c54f2a8898 100644 --- a/tests/data/test1327 +++ b/tests/data/test1327 @@ -20,9 +20,9 @@ http telnet - + TELNET check of upload with stdout redirected - + GET /ignore/for/%TESTNUMBER HTTP/1.0 diff --git a/tests/data/test1328 b/tests/data/test1328 index 5055a07703..8466abde67 100644 --- a/tests/data/test1328 +++ b/tests/data/test1328 @@ -43,10 +43,10 @@ Funny-head: yesyes http - + HTTP GET a globbed range with -f - - + + -f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o %LOGDIR/#1 diff --git a/tests/data/test1329 b/tests/data/test1329 index 0ca5b5aae3..8f1740bb7b 100644 --- a/tests/data/test1329 +++ b/tests/data/test1329 @@ -11,10 +11,10 @@ HTTP proxy http - + /-prefixed proxy name - - + + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x "/server" diff --git a/tests/data/test133 b/tests/data/test133 index 8b914cb713..c8d2f9039e 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -33,10 +33,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP compulsory .netrc; ignore passwd in URL - - + + -n --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ diff --git a/tests/data/test1331 b/tests/data/test1331 index a233c63c4e..35598960e3 100644 --- a/tests/data/test1331 +++ b/tests/data/test1331 @@ -58,10 +58,10 @@ hello http - + HTTP --proxy-anyauth and 407 with cookies - - + + -U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c %LOGDIR/dump%TESTNUMBER diff --git a/tests/data/test1332 b/tests/data/test1332 index b7d201be0b..8352940823 100644 --- a/tests/data/test1332 +++ b/tests/data/test1332 @@ -46,10 +46,10 @@ body http - + HTTP POST with 303 redirect and --post303 - - + + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303 diff --git a/tests/data/test1333 b/tests/data/test1333 index 0a991e48b2..e6dbb73a62 100644 --- a/tests/data/test1333 +++ b/tests/data/test1333 @@ -27,10 +27,10 @@ Connection: close http - + HTTP POST zero length, chunked-encoded - - + + -d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test135 b/tests/data/test135 index 353735d6a4..3dc1d531f5 100644 --- a/tests/data/test135 +++ b/tests/data/test135 @@ -28,10 +28,10 @@ Range ftp - + FTP retrieve a byte-range - - + + -r 4-16 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test136 b/tests/data/test136 index 63d936b540..ef0b2c49ac 100644 --- a/tests/data/test136 +++ b/tests/data/test136 @@ -18,10 +18,10 @@ RETR ftp - + FTP with user and no password - - + + -u user: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test137 b/tests/data/test137 index 7766f09ff5..33b93589ec 100644 --- a/tests/data/test137 +++ b/tests/data/test137 @@ -21,10 +21,10 @@ RETRNOSIZE ftp - + FTP download without size in RETR string - - + + ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER diff --git a/tests/data/test138 b/tests/data/test138 index f70eb078e9..db3b6ec7df 100644 --- a/tests/data/test138 +++ b/tests/data/test138 @@ -24,10 +24,10 @@ REPLY SIZE 500 command not understood ftp - + FTP download without size in RETR string and no SIZE command - - + + ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER diff --git a/tests/data/test139 b/tests/data/test139 index ab04953c50..160f628e2c 100644 --- a/tests/data/test139 +++ b/tests/data/test139 @@ -21,10 +21,10 @@ this is file contents ftp - + FTP download a newer file with -z - - + + ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989" diff --git a/tests/data/test1394 b/tests/data/test1394 index d3ffb2d33f..30be0c85a7 100644 --- a/tests/data/test1394 +++ b/tests/data/test1394 @@ -14,9 +14,9 @@ none unittest - + unit test for parse_cert_parameter() - + diff --git a/tests/data/test1395 b/tests/data/test1395 index 409e0d631b..a73e043ca5 100644 --- a/tests/data/test1395 +++ b/tests/data/test1395 @@ -14,8 +14,8 @@ none unittest - + Curl_dedotdotify - + diff --git a/tests/data/test1396 b/tests/data/test1396 index d8b432d8b1..d65ab25520 100644 --- a/tests/data/test1396 +++ b/tests/data/test1396 @@ -16,9 +16,9 @@ none unittest - + curl_easy_escape and curl_easy_unescape - + diff --git a/tests/data/test1398 b/tests/data/test1398 index 436cac82d4..f77e321749 100644 --- a/tests/data/test1398 +++ b/tests/data/test1398 @@ -15,9 +15,9 @@ none unittest - + curl_msnprintf unit tests - + diff --git a/tests/data/test1399 b/tests/data/test1399 index 6d6ec7a5b0..f8a7c19bb4 100644 --- a/tests/data/test1399 +++ b/tests/data/test1399 @@ -15,8 +15,8 @@ none unittest - + Curl_pgrsTime unit tests - + diff --git a/tests/data/test14 b/tests/data/test14 index f2bf61004e..1bffda78d7 100644 --- a/tests/data/test14 +++ b/tests/data/test14 @@ -20,10 +20,10 @@ Connection: close http - + HTTP HEAD with Connection: close - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head diff --git a/tests/data/test140 b/tests/data/test140 index 36a01cc1c2..5e29f5c7c7 100644 --- a/tests/data/test140 +++ b/tests/data/test140 @@ -20,10 +20,10 @@ FTP ftp - + FTP download file with -z, expected to not transfer - - + + ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004" diff --git a/tests/data/test1400 b/tests/data/test1400 index 837a20b093..2264771605 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -24,13 +24,13 @@ Connection: close http - + --libcurl for simple HTTP GET - + SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1401 b/tests/data/test1401 index 1706545915..d7b15776a1 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -28,9 +28,9 @@ Connection: close http - + --libcurl for GET with various options - + http ftp @@ -39,7 +39,7 @@ file SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file" diff --git a/tests/data/test1402 b/tests/data/test1402 index 5003ba8f3e..6332fa168c 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -25,13 +25,13 @@ Connection: close http - + --libcurl for simple POST - + SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux" diff --git a/tests/data/test1403 b/tests/data/test1403 index 3eab6222d5..fb4882c637 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -25,13 +25,13 @@ Connection: close http - + --libcurl for GET with query - + SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux" diff --git a/tests/data/test1404 b/tests/data/test1404 index 5df73ae4e5..648b7b2838 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -29,13 +29,13 @@ Mime http - + --libcurl for HTTP RFC1867-type formposting - -F with 3 files, one with explicit type & encoder - + SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,%LOGDIR/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl %LOGDIR/test%TESTNUMBER.c # We create this file before the command is invoked! diff --git a/tests/data/test1405 b/tests/data/test1405 index 5bb0450e63..8a13a688aa 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -29,13 +29,13 @@ REPLY FAIL 500 this might not be a failure! ftp - + --libcurl for FTP with quote ops - + SSL_CERT_FILE= - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1406 b/tests/data/test1406 index 3a00b44db4..235155038a 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -22,9 +22,9 @@ CAPA SIZE smtp - + --libcurl for SMTP - + SSL_CERT_FILE= @@ -34,7 +34,7 @@ To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1407 b/tests/data/test1407 index 160c86449e..c8b880a230 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -23,9 +23,9 @@ REPLY LIST +OK %TESTNUMBER 100\r\n. pop3 - + --libcurl for POP3 LIST one message - + SSL_CERT_FILE= diff --git a/tests/data/test1408 b/tests/data/test1408 index e27923ad76..925be875b6 100644 --- a/tests/data/test1408 +++ b/tests/data/test1408 @@ -45,10 +45,10 @@ ipv6 http-ipv6 - + HTTP receive cookies over IPV6 - - + + -c %LOGDIR/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002 diff --git a/tests/data/test1409 b/tests/data/test1409 index 120bf3cf39..6e248ca10b 100644 --- a/tests/data/test1409 +++ b/tests/data/test1409 @@ -13,10 +13,10 @@ FAILURE none - + Pass in string to -C - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -C wrong diff --git a/tests/data/test141 b/tests/data/test141 index 3fff42d9b3..425a98f2a6 100644 --- a/tests/data/test141 +++ b/tests/data/test141 @@ -22,10 +22,10 @@ NOBODY ftp - + FTP download info with -I - - + + ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I diff --git a/tests/data/test1410 b/tests/data/test1410 index 65e52d4065..0a9f4878b0 100644 --- a/tests/data/test1410 +++ b/tests/data/test1410 @@ -13,10 +13,10 @@ FAILURE none - + Pass in negative number to --max-time - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --max-time -4 diff --git a/tests/data/test1411 b/tests/data/test1411 index 47b36f2b91..bd8a8dd689 100644 --- a/tests/data/test1411 +++ b/tests/data/test1411 @@ -32,10 +32,10 @@ http # make sure there's no Expect: 100-continue when there's no file to send! - + HTTP with zero size file PUT - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER # create an empty file diff --git a/tests/data/test1412 b/tests/data/test1412 index 41f6144150..e4720dcdcc 100644 --- a/tests/data/test1412 +++ b/tests/data/test1412 @@ -90,10 +90,10 @@ http !SSPI crypto - + HTTP GET with --anyauth with two URLs (picking Digest) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test1413 b/tests/data/test1413 index 920417baed..1ab4c1a818 100644 --- a/tests/data/test1413 +++ b/tests/data/test1413 @@ -45,10 +45,10 @@ body http - + HTTP redirect with fragment in new URL - - + + http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L diff --git a/tests/data/test1414 b/tests/data/test1414 index 33214b04f2..4be9b54222 100644 --- a/tests/data/test1414 +++ b/tests/data/test1414 @@ -28,10 +28,10 @@ REPLY EPRT 502 no such command ftp - + FTP PORT without SIZE or EPRT support - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - diff --git a/tests/data/test1416 b/tests/data/test1416 index f3c6ba590e..1af3b61f08 100644 --- a/tests/data/test1416 +++ b/tests/data/test1416 @@ -33,10 +33,10 @@ cccccccccccccccccccccccccccccccc http - + HTTP GET with chunked Transfer-Encoding overflowed chunked size - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1417 b/tests/data/test1417 index 4400cec0ce..7c9be16b6e 100644 --- a/tests/data/test1417 +++ b/tests/data/test1417 @@ -45,10 +45,10 @@ chunky-trailer: header data http - + HTTP GET with chunked encoding and chunked trailer without CRs - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER diff --git a/tests/data/test1418 b/tests/data/test1418 index a089154740..748040811c 100644 --- a/tests/data/test1418 +++ b/tests/data/test1418 @@ -83,10 +83,10 @@ http !SSPI crypto - + HTTP with --anyauth and connection reuse - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003 diff --git a/tests/data/test1419 b/tests/data/test1419 index b16cc933d7..aada395f8a 100644 --- a/tests/data/test1419 +++ b/tests/data/test1419 @@ -41,10 +41,10 @@ Feel free to get it http - + HTTP with --anyauth (but no auth!) and connection reuse - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003 diff --git a/tests/data/test142 b/tests/data/test142 index f64dddb596..c4ad11a6d8 100644 --- a/tests/data/test142 +++ b/tests/data/test142 @@ -16,10 +16,10 @@ many parts there are ftp - + FTP URL with 150 dir levels - - + + ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/part10/part11/part12/part13/part14/part15/part16/part17/part18/part19/part20/part21/part22/part23/part24/part25/part26/part27/part28/part29/part30/part31/part32/part33/part34/part35/part36/part37/part38/part39/part40/part41/part42/part43/part44/part45/part46/part47/part48/part49/part50/part51/part52/part53/part54/part55/part56/part57/part58/part59/part60/part61/part62/part63/part64/part65/part66/part67/part68/part69/part70/part71/part72/part73/part74/part75/part76/part77/part78/part79/part80/part81/part82/part83/part84/part85/part86/part87/part88/part89/part90/part91/part92/part93/part94/part95/part96/part97/part98/part99/part100/part101/part102/part103/part104/part105/part106/part107/part108/part109/part110/part111/part112/part113/part114/part115/part116/part117/part118/part119/part120/part121/part122/part123/part124/part125/part126/part127/part128/part129/part130/part131/part132/part133/part134/part135/part136/part137/part138/part139/part140/part141/part142/part143/part144/part145/part146/part147/part148/part149/part150/%TESTNUMBER diff --git a/tests/data/test1420 b/tests/data/test1420 index e6f899f417..1cb3b6ffe2 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -29,9 +29,9 @@ body imap - + --libcurl for IMAP FETCH message - + SSL_CERT_FILE= diff --git a/tests/data/test1421 b/tests/data/test1421 index ec497ab642..d62adfb046 100644 --- a/tests/data/test1421 +++ b/tests/data/test1421 @@ -29,10 +29,10 @@ connection-monitor http - + Re-using HTTP proxy connection for two different host names - - + + --proxy http://%HOSTIP:%HTTPPORT http://test.remote.haxx.se.%TESTNUMBER:8990/ http://different.remote.haxx.se.%TESTNUMBER:8990 diff --git a/tests/data/test1425 b/tests/data/test1425 index 2bd6d84379..f51483dd0c 100644 Binary files a/tests/data/test1425 and b/tests/data/test1425 differ diff --git a/tests/data/test1426 b/tests/data/test1426 index 9ed994a56a..d53138afaa 100644 Binary files a/tests/data/test1426 and b/tests/data/test1426 differ diff --git a/tests/data/test1427 b/tests/data/test1427 index adce46a84c..ce5cbd15a6 100644 --- a/tests/data/test1427 +++ b/tests/data/test1427 @@ -11,10 +11,10 @@ integer overflow none - + too large -m timeout value - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -m 184467440737095510 diff --git a/tests/data/test1428 b/tests/data/test1428 index ac91fd2f56..9e7164454a 100644 --- a/tests/data/test1428 +++ b/tests/data/test1428 @@ -46,10 +46,10 @@ contents http http-proxy - + HTTP over proxy-tunnel with --proxy-header and --header - - + + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' --header "header-type: server" --proxy-header "header-type: proxy" diff --git a/tests/data/test1429 b/tests/data/test1429 index 2f9dfb9311..3d8dce1a95 100644 --- a/tests/data/test1429 +++ b/tests/data/test1429 @@ -33,8 +33,8 @@ http HTTP GET with 999 response code - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}' diff --git a/tests/data/test143 b/tests/data/test143 index be5b33571d..ed89e70dec 100644 --- a/tests/data/test143 +++ b/tests/data/test143 @@ -18,10 +18,10 @@ bla bla bla ftp - + FTP URL with type=a - - + + "ftp://%HOSTIP:%FTPPORT/%2ftmp/moo/%TESTNUMBER;type=a" diff --git a/tests/data/test1430 b/tests/data/test1430 index 8ed513c606..11db3ccbfc 100644 --- a/tests/data/test1430 +++ b/tests/data/test1430 @@ -29,10 +29,10 @@ Funny-head: yesyes http - + HTTP GET with negative response code - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1431 b/tests/data/test1431 index 26cf4aaf79..3f396a4a21 100644 --- a/tests/data/test1431 +++ b/tests/data/test1431 @@ -29,10 +29,10 @@ Funny-head: yesyes http - + HTTP GET with single-digit response code - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1432 b/tests/data/test1432 index d134688a31..4789057a1b 100644 --- a/tests/data/test1432 +++ b/tests/data/test1432 @@ -32,8 +32,8 @@ http HTTP GET with 100-digit response code and survive - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1433 b/tests/data/test1433 index ac50816358..aec6181a1e 100644 --- a/tests/data/test1433 +++ b/tests/data/test1433 @@ -32,8 +32,8 @@ http HTTP GET with 100-digit subversion number in response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1434 b/tests/data/test1434 index 75baba7e82..b6f775e0f6 100644 --- a/tests/data/test1434 +++ b/tests/data/test1434 @@ -54,10 +54,10 @@ Content-Type: text/plain http - + HTTP GET resume at exactly the existing file size is fine - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100 diff --git a/tests/data/test1435 b/tests/data/test1435 index 5e91f02892..0e1e34f559 100644 --- a/tests/data/test1435 +++ b/tests/data/test1435 @@ -24,10 +24,10 @@ unix-sockets http-unix - + simple HTTP GET over Unix socket - - + + --unix-socket %HTTPUNIXPATH http://server-interpreted.example.com/%TESTNUMBER diff --git a/tests/data/test1436 b/tests/data/test1436 index 38190f4a85..352ef34e0b 100644 --- a/tests/data/test1436 +++ b/tests/data/test1436 @@ -38,10 +38,10 @@ unix-sockets http-unix - + HTTP requests with multiple connections over Unix socket - - + + --unix-socket %HTTPUNIXPATH http://one.example.com/%TESTNUMBER0001 http://two.example.com/%TESTNUMBER0002 http://one.example.com/%TESTNUMBER0003 diff --git a/tests/data/test1437 b/tests/data/test1437 index 87a36d5651..29e800a43d 100644 --- a/tests/data/test1437 +++ b/tests/data/test1437 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with duplicated WWW-Authenticate parameters - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test144 b/tests/data/test144 index 4419b09f52..be2ca5c8c5 100644 --- a/tests/data/test144 +++ b/tests/data/test144 @@ -21,10 +21,10 @@ REPLY NLST 450 No files found ftp - + FTP NLST dir list without contents, using PORT - - + + ftp://%HOSTIP:%FTPPORT/ -P - -l diff --git a/tests/data/test1444 b/tests/data/test1444 index 7d79fbbab2..61b3a29f4c 100644 --- a/tests/data/test1444 +++ b/tests/data/test1444 @@ -22,10 +22,10 @@ file data ftp - + FTP with --remote-time - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time # Verify the mtime of the file. The mtime is specifically chosen to be an even diff --git a/tests/data/test1445 b/tests/data/test1445 index 7fb1d1df6c..fee8932f14 100644 --- a/tests/data/test1445 +++ b/tests/data/test1445 @@ -17,10 +17,10 @@ file perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir - + file:// with --remote-time - - + + file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time diff --git a/tests/data/test1446 b/tests/data/test1446 index 5e11f11b07..f633ac17ad 100644 --- a/tests/data/test1446 +++ b/tests/data/test1446 @@ -20,10 +20,10 @@ sftp perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP with --remote-time - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time diff --git a/tests/data/test1447 b/tests/data/test1447 index 2a22e558bd..0b0e4e65c3 100644 --- a/tests/data/test1447 +++ b/tests/data/test1447 @@ -20,10 +20,10 @@ none http proxy - + Provide illegal proxy name - - + + --proxy "http://a:b@/x" http://%HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1448 b/tests/data/test1448 index 600f724156..6a9ba5212a 100644 --- a/tests/data/test1448 +++ b/tests/data/test1448 @@ -48,11 +48,11 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + Redirect following to UTF-8 IDN host name - + - + http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --connect-to %HOSTIP:%HTTPPORT:%HOSTIP:%HTTPPORT diff --git a/tests/data/test1449 b/tests/data/test1449 index ba24ef9122..0b9de0192c 100644 --- a/tests/data/test1449 +++ b/tests/data/test1449 @@ -17,10 +17,10 @@ Resume ftp - + FTP download range with integer overflow - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232- diff --git a/tests/data/test145 b/tests/data/test145 index 1e80cf8ce8..53f3f631d7 100644 --- a/tests/data/test145 +++ b/tests/data/test145 @@ -20,10 +20,10 @@ REPLY NLST 550 Have a taste on this! ftp - + FTP NLST dir list with weird reply code, using PORT - - + + ftp://%HOSTIP:%FTPPORT/ -P - -l diff --git a/tests/data/test1450 b/tests/data/test1450 index ca3ac8849a..5d7e568bc2 100644 --- a/tests/data/test1450 +++ b/tests/data/test1450 @@ -19,10 +19,10 @@ dict dict - + Basic DICT lookup - - + + dict://%HOSTIP:%DICTPORT/d:basic diff --git a/tests/data/test1452 b/tests/data/test1452 index d1b7fa9cdd..6763265b7d 100644 --- a/tests/data/test1452 +++ b/tests/data/test1452 @@ -22,13 +22,13 @@ telnet telnet - + Basic TELNET negotiation - + test%TESTNUMBER - + telnet://%HOSTIP:%TELNETPORT --upload-file - diff --git a/tests/data/test1453 b/tests/data/test1453 index 76b5acda4f..aa0878efa9 100644 --- a/tests/data/test1453 +++ b/tests/data/test1453 @@ -19,10 +19,10 @@ none tftp - + Too long tftp filename - - + + tftp://%HOSTIP:%NOLISTENPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz diff --git a/tests/data/test1454 b/tests/data/test1454 index 36e28e49ab..4908a178db 100644 --- a/tests/data/test1454 +++ b/tests/data/test1454 @@ -19,9 +19,9 @@ http - + --connect-to with IPv6 address w/o IPv6 support! - + --connect-to localhost:80:[::1]:80 localhost diff --git a/tests/data/test1456 b/tests/data/test1456 index 4aca9ca4e6..3f3a74783d 100644 --- a/tests/data/test1456 +++ b/tests/data/test1456 @@ -36,10 +36,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET with PROXY protocol - - + + -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-protocol diff --git a/tests/data/test1459 b/tests/data/test1459 index 2a69a60330..c05da3cb58 100644 --- a/tests/data/test1459 +++ b/tests/data/test1459 @@ -19,10 +19,10 @@ mkdir -p %PWD/%LOGDIR/test%TESTNUMBER.dir/.ssh sftp !oldlibssh - + SFTP with corrupted known_hosts - - + + -u : sftp://%HOSTIP:%SSHPORT/ -l diff --git a/tests/data/test146 b/tests/data/test146 index f9f01174fb..803fbfc4d7 100644 --- a/tests/data/test146 +++ b/tests/data/test146 @@ -19,10 +19,10 @@ this is file contents ftp - + persistent FTP with different paths - - + + ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1461 b/tests/data/test1461 index 65797a405a..e25e29f39e 100644 --- a/tests/data/test1461 +++ b/tests/data/test1461 @@ -16,10 +16,10 @@ none - + curl important --help - - + + --help diff --git a/tests/data/test1462 b/tests/data/test1462 index ce99029465..654e443444 100644 --- a/tests/data/test1462 +++ b/tests/data/test1462 @@ -16,10 +16,10 @@ none - + curl invalid category --help - - + + --help sdfafdsfadsfsd diff --git a/tests/data/test1463 b/tests/data/test1463 index 3904324c7e..c59ac552b8 100644 --- a/tests/data/test1463 +++ b/tests/data/test1463 @@ -20,10 +20,10 @@ none file - + curl file category --help - - + + --help file diff --git a/tests/data/test1464 b/tests/data/test1464 index 44a7adcf0b..091933df2d 100644 --- a/tests/data/test1464 +++ b/tests/data/test1464 @@ -20,10 +20,10 @@ none file - + curl file category --help with lower/upper mix - - + + --help fIlE diff --git a/tests/data/test1465 b/tests/data/test1465 index 341237d24e..380943d926 100644 --- a/tests/data/test1465 +++ b/tests/data/test1465 @@ -25,13 +25,13 @@ Connection: close http - + --libcurl for POST with binary content - + SSL_CERT_FILE= - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --data-binary @%LOGDIR/%TESTNUMBER-upload # "ab\x81""cd\0e\\\"?\r\n\t\x01""fghi%x1Ajklm%xFD" diff --git a/tests/data/test1466 b/tests/data/test1466 index 0955d660c2..315974ad41 100644 --- a/tests/data/test1466 +++ b/tests/data/test1466 @@ -25,8 +25,8 @@ http HTTP GET with 3-digit response and only digits in reason - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1467 b/tests/data/test1467 index 4e1d68fecf..bf6ed8f389 100644 --- a/tests/data/test1467 +++ b/tests/data/test1467 @@ -38,10 +38,10 @@ unix-sockets http socks5unix - + HTTP GET via SOCKS5 proxy via unix sockets - - + + --socks5 localhost%SOCKSUNIXPATH http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1468 b/tests/data/test1468 index b4030babd8..dad25df125 100644 --- a/tests/data/test1468 +++ b/tests/data/test1468 @@ -39,10 +39,10 @@ unix-sockets http socks5unix - + HTTP GET with host name using SOCKS5h via unix sockets - - + + http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOCKSUNIXPATH diff --git a/tests/data/test1469 b/tests/data/test1469 index f2b3882cb2..1aa512e50f 100644 --- a/tests/data/test1469 +++ b/tests/data/test1469 @@ -12,10 +12,10 @@ FAILURE none - + Space in FTP upload URL - - + + "ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T %LOGDIR/irrelevant-file diff --git a/tests/data/test147 b/tests/data/test147 index 0661186482..769043d489 100644 --- a/tests/data/test147 +++ b/tests/data/test147 @@ -21,10 +21,10 @@ COUNT CWD 1 ftp - + FTP with --ftp-create-dirs (failing CWD) - - + + ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs diff --git a/tests/data/test1470 b/tests/data/test1470 index 30f539d4bc..ad4fb711af 100644 --- a/tests/data/test1470 +++ b/tests/data/test1470 @@ -40,10 +40,10 @@ unix-sockets https socks5unix - + HTTPS GET with host name using SOCKS5h via unix sockets - - + + https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%SOCKSUNIXPATH diff --git a/tests/data/test1473 b/tests/data/test1473 index a437730ef4..5e4d18348b 100644 --- a/tests/data/test1473 +++ b/tests/data/test1473 @@ -28,10 +28,10 @@ Content-Length: 6 http - + first HTTP header starts with white space - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1474 b/tests/data/test1474 index c27ed7da2a..a87044d1a6 100644 --- a/tests/data/test1474 +++ b/tests/data/test1474 @@ -82,10 +82,10 @@ connection-monitor http - + HTTP PUT with Expect: 100-continue and 417 response during upload - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --limit-rate 64K --expect100-timeout 0.001 diff --git a/tests/data/test148 b/tests/data/test148 index 8e9f842d8e..051d31a9de 100644 --- a/tests/data/test148 +++ b/tests/data/test148 @@ -18,10 +18,10 @@ REPLY MKD 550 We will have no such thing ftp - + FTP with --ftp-create-dirs (failing MKD) - - + + ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs diff --git a/tests/data/test149 b/tests/data/test149 index e01c3f1280..404922b296 100644 --- a/tests/data/test149 +++ b/tests/data/test149 @@ -14,10 +14,10 @@ FTP ftp - + FTP with multiple uploads - - + + -T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER diff --git a/tests/data/test15 b/tests/data/test15 index ad7c06cb36..ba24d2e0b2 100644 --- a/tests/data/test15 +++ b/tests/data/test15 @@ -24,10 +24,10 @@ Repeated nonsense-headers http - + --write-out test - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --write-out "%{url_effective} %{http_code} %{size_download}\n" diff --git a/tests/data/test1500 b/tests/data/test1500 index 241f227f99..0454f8ecbe 100644 --- a/tests/data/test1500 +++ b/tests/data/test1500 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + curl_multi_wait - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1501 b/tests/data/test1501 index 68b55896da..195c17998c 100644 --- a/tests/data/test1501 +++ b/tests/data/test1501 @@ -30,10 +30,10 @@ lib%TESTNUMBER ftp - + FTP with multi interface and slow LIST response - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ diff --git a/tests/data/test1502 b/tests/data/test1502 index 859a98fc80..e2639f404a 100644 --- a/tests/data/test1502 +++ b/tests/data/test1502 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + HTTP multi with CURLOPT_RESOLVE, cleanup sequence UA - - + + http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP diff --git a/tests/data/test1503 b/tests/data/test1503 index a093ac3bba..9c746c74e8 100644 --- a/tests/data/test1503 +++ b/tests/data/test1503 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + HTTP multi with CURLOPT_RESOLVE, cleanup sequence PA - - + + http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP diff --git a/tests/data/test1504 b/tests/data/test1504 index 8dc4f1856a..663e25e274 100644 --- a/tests/data/test1504 +++ b/tests/data/test1504 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + HTTP multi with CURLOPT_RESOLVE, cleanup sequence UB - - + + http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP diff --git a/tests/data/test1505 b/tests/data/test1505 index 9ddac46b8e..666e4d984b 100644 --- a/tests/data/test1505 +++ b/tests/data/test1505 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + HTTP multi with CURLOPT_RESOLVE, cleanup sequence PB - - + + http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP diff --git a/tests/data/test1506 b/tests/data/test1506 index aee53a9225..9eb38cf6d1 100644 --- a/tests/data/test1506 +++ b/tests/data/test1506 @@ -51,10 +51,10 @@ http lib%TESTNUMBER - + HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS) - - + + http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT diff --git a/tests/data/test1507 b/tests/data/test1507 index 8208752adf..e1eb12bc36 100644 --- a/tests/data/test1507 +++ b/tests/data/test1507 @@ -22,16 +22,16 @@ lib%TESTNUMBER # based on bug report #1184 - + SMTP with multi interface and CURLE_ABORTED_BY_CALLBACK - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER diff --git a/tests/data/test1508 b/tests/data/test1508 index 78ff18fb3d..9b210ec0f3 100644 --- a/tests/data/test1508 +++ b/tests/data/test1508 @@ -14,10 +14,10 @@ none lib%TESTNUMBER - + Close a multi handle without using it - - + + http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER diff --git a/tests/data/test1509 b/tests/data/test1509 index 7c427bf7fd..d7a7519c08 100644 --- a/tests/data/test1509 +++ b/tests/data/test1509 @@ -56,10 +56,10 @@ lib%TESTNUMBER proxy - + simple multi http:// through proxytunnel with authentication info - - + + http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test151 b/tests/data/test151 index d05c7a0005..98035f8b47 100644 --- a/tests/data/test151 +++ b/tests/data/test151 @@ -24,10 +24,10 @@ authentication so we should still fail. http - + HTTP GET with an error code that might trick authentication - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1510 b/tests/data/test1510 index eccbb6c942..41a5b29c3f 100644 --- a/tests/data/test1510 +++ b/tests/data/test1510 @@ -51,10 +51,10 @@ http lib%TESTNUMBER - + HTTP GET connection cache limit (CURLOPT_MAXCONNECTS) - - + + http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT diff --git a/tests/data/test1512 b/tests/data/test1512 index 7c04660fe5..c3a532c96b 100644 --- a/tests/data/test1512 +++ b/tests/data/test1512 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + GLOBAL CACHE test over two easy performs - - + + http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER %HOSTIP %HTTPPORT diff --git a/tests/data/test1513 b/tests/data/test1513 index a32d2eb5c1..90c32229f7 100644 --- a/tests/data/test1513 +++ b/tests/data/test1513 @@ -25,12 +25,12 @@ http lib%TESTNUMBER - + return failure immediately from progress callback - + # this server/host won't be used for real - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1517 b/tests/data/test1517 index 539dd6208f..c9b5e2e8c4 100644 --- a/tests/data/test1517 +++ b/tests/data/test1517 @@ -49,10 +49,10 @@ lib%TESTNUMBER ./libtest/lib%TESTNUMBER check - + HTTP POST, server responds before completed send - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1518 b/tests/data/test1518 index 9b3f6be605..ea5304d1b6 100644 --- a/tests/data/test1518 +++ b/tests/data/test1518 @@ -32,10 +32,10 @@ http lib%TESTNUMBER - + Extract Location: with broken URL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1519 b/tests/data/test1519 index 2eadb17060..f57f68544a 100644 --- a/tests/data/test1519 +++ b/tests/data/test1519 @@ -32,10 +32,10 @@ http lib1518 - + Extract Location: with broken absolute URL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test152 b/tests/data/test152 index a558ed596b..31c2360192 100644 --- a/tests/data/test152 +++ b/tests/data/test152 @@ -25,10 +25,10 @@ authentication so we should still fail. http - + HTTP GET with an error code that might trick authentication and --fail - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail diff --git a/tests/data/test1520 b/tests/data/test1520 index fc031ad001..c360cabc75 100644 --- a/tests/data/test1520 +++ b/tests/data/test1520 @@ -16,9 +16,9 @@ smtp lib%TESTNUMBER - + SMTP with CRLF-dot-CRLF in data - + From: different To: another @@ -31,7 +31,7 @@ To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER diff --git a/tests/data/test1521 b/tests/data/test1521 index f086243e43..21d51fdca7 100644 --- a/tests/data/test1521 +++ b/tests/data/test1521 @@ -15,10 +15,10 @@ none lib%TESTNUMBER - + Test all curl_easy_setopt and curl_easy_getinfo options - - + + unused diff --git a/tests/data/test1524 b/tests/data/test1524 index b5ac86610b..8756ec6306 100644 --- a/tests/data/test1524 +++ b/tests/data/test1524 @@ -41,10 +41,10 @@ body http - + HTTP PUT with 303 redirect - - + + http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T %LOGDIR/upload%TESTNUMBER.txt diff --git a/tests/data/test1525 b/tests/data/test1525 index 33f71c877c..2778c3f564 100644 --- a/tests/data/test1525 +++ b/tests/data/test1525 @@ -45,10 +45,10 @@ http-proxy lib%TESTNUMBER - + CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED - - + + http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test1526 b/tests/data/test1526 index 4076124054..cd4a4f48b0 100644 --- a/tests/data/test1526 +++ b/tests/data/test1526 @@ -47,10 +47,10 @@ http-proxy lib%TESTNUMBER - + CURLOPT_PROXYHEADER: separate host/proxy headers - - + + http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test1527 b/tests/data/test1527 index 3f35cb841e..bf377d8262 100644 --- a/tests/data/test1527 +++ b/tests/data/test1527 @@ -46,10 +46,10 @@ http-proxy lib%TESTNUMBER - + Check same headers are generated with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED - - + + http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test1528 b/tests/data/test1528 index 8bd056656f..8c0209ce80 100644 --- a/tests/data/test1528 +++ b/tests/data/test1528 @@ -37,10 +37,10 @@ http-proxy lib%TESTNUMBER - + Separately specified proxy/server headers sent in a proxy GET - - + + http://the.old.moo:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test1529 b/tests/data/test1529 index 68136aae30..a06ce75db9 100644 --- a/tests/data/test1529 +++ b/tests/data/test1529 @@ -25,10 +25,10 @@ http-proxy lib%TESTNUMBER - + HTTP request-injection in URL sent over proxy - - + + "http://the.old.moo:%HTTPPORT/%TESTNUMBER" %HOSTIP:%PROXYPORT diff --git a/tests/data/test153 b/tests/data/test153 index c51824fe7b..b55a70a038 100644 --- a/tests/data/test153 +++ b/tests/data/test153 @@ -77,10 +77,10 @@ http !SSPI crypto - + HTTP with Digest authorization with stale=true - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test1530 b/tests/data/test1530 index 0fbd21cf07..2475c14175 100644 --- a/tests/data/test1530 +++ b/tests/data/test1530 @@ -15,9 +15,9 @@ http lib%TESTNUMBER - + CURLOPT_OPENSOCKETFUNCTION returns bad socket - + # it should be detected and an error should be reported diff --git a/tests/data/test1531 b/tests/data/test1531 index e590af08ba..00801bb975 100644 Binary files a/tests/data/test1531 and b/tests/data/test1531 differ diff --git a/tests/data/test154 b/tests/data/test154 index a05eb8aea5..4f818f00f7 100644 --- a/tests/data/test154 +++ b/tests/data/test154 @@ -63,10 +63,10 @@ http !SSPI crypto - + HTTP PUT with --anyauth authorization (picking Digest) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1540 b/tests/data/test1540 index 0ef5101ced..ad496449b7 100644 --- a/tests/data/test1540 +++ b/tests/data/test1540 @@ -47,10 +47,10 @@ http lib%TESTNUMBER - + chunked with trailers and pausing the receive - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1542 b/tests/data/test1542 index 7de153d77c..f9806cda81 100644 --- a/tests/data/test1542 +++ b/tests/data/test1542 @@ -26,10 +26,10 @@ http lib%TESTNUMBER - + connection reuse with CURLOPT_MAXLIFETIME_CONN - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1544 b/tests/data/test1544 index 861c4fbfcc..f658f5a749 100644 --- a/tests/data/test1544 +++ b/tests/data/test1544 @@ -12,9 +12,9 @@ source analysis none - + Verify all string options are translated by OS/400 wrapper - + %SRCDIR/check-translatable-options.pl %SRCDIR/.. diff --git a/tests/data/test1550 b/tests/data/test1550 index bfb80a1cab..2d297a47af 100644 --- a/tests/data/test1550 +++ b/tests/data/test1550 @@ -19,10 +19,10 @@ none lib%TESTNUMBER - + verify setting pipeling blocklisting options - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER diff --git a/tests/data/test1551 b/tests/data/test1551 index 4c60db85df..8af8d6641e 100644 --- a/tests/data/test1551 +++ b/tests/data/test1551 @@ -38,10 +38,10 @@ http lib%TESTNUMBER - + re-run redirected transfer without setting URL again - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1552 b/tests/data/test1552 index 9468f41338..fd35ca1f61 100644 --- a/tests/data/test1552 +++ b/tests/data/test1552 @@ -31,14 +31,14 @@ body imap - + IMAP multi transfer error without curl_multi_remove_handle - + # tool is what to use instead of 'curl' lib%TESTNUMBER - + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test1553 b/tests/data/test1553 index 595eb5ba59..0c01ab3e69 100644 --- a/tests/data/test1553 +++ b/tests/data/test1553 @@ -34,9 +34,9 @@ Mime imap - + IMAP cleanup before a connection was created - + # tool is what to use instead of 'curl' lib%TESTNUMBER diff --git a/tests/data/test1555 b/tests/data/test1555 index 6985630d4d..e3c7e55c69 100644 --- a/tests/data/test1555 +++ b/tests/data/test1555 @@ -25,12 +25,12 @@ http lib%TESTNUMBER - + verify api is protected against calls from callbacks - + # this server/host won't be used for real - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1556 b/tests/data/test1556 index 08951a8d22..80254da2d4 100644 --- a/tests/data/test1556 +++ b/tests/data/test1556 @@ -35,10 +35,10 @@ http lib%TESTNUMBER - + send long HTTP headers to header callback - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test156 b/tests/data/test156 index 214b5396ee..877c215b93 100644 --- a/tests/data/test156 +++ b/tests/data/test156 @@ -24,10 +24,10 @@ PUT received fine. Thank you very much http - + HTTP PUT with --anyauth (when the server requires none) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1560 b/tests/data/test1560 index 5ed0adde89..fc27000d14 100644 --- a/tests/data/test1560 +++ b/tests/data/test1560 @@ -26,9 +26,9 @@ ldap dict ftp - + URL API - + lib%TESTNUMBER diff --git a/tests/data/test1567 b/tests/data/test1567 index 3e6ce8812b..68b1fe2110 100644 --- a/tests/data/test1567 +++ b/tests/data/test1567 @@ -39,10 +39,10 @@ http lib%TESTNUMBER - + re-run redirected transfer without setting CURLU URL again - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test1569 b/tests/data/test1569 index 3342f84fc4..159a813919 100644 --- a/tests/data/test1569 +++ b/tests/data/test1569 @@ -26,9 +26,9 @@ REPLY EPSV 500 no such command ftp - + FTP first type=A then regular URL - + lib%TESTNUMBER diff --git a/tests/data/test157 b/tests/data/test157 index 63e611c783..5ab45ec05b 100644 --- a/tests/data/test157 +++ b/tests/data/test157 @@ -24,10 +24,10 @@ GET received and served just fine. Thank you very much http - + HTTP GET with --anyauth (when the server requires none) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test1570 b/tests/data/test1570 index 40c87ef404..713ab5ea77 100644 --- a/tests/data/test1570 +++ b/tests/data/test1570 @@ -26,9 +26,9 @@ REPLY EPSV 500 no such command ftp - + FTP first type=D then regular URL - + lib1569 diff --git a/tests/data/test158 b/tests/data/test158 index 3110d805ad..db3a49b7f5 100644 --- a/tests/data/test158 +++ b/tests/data/test158 @@ -23,10 +23,10 @@ Mime http - + HTTP multipart formpost with only a 100 reply - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel diff --git a/tests/data/test159 b/tests/data/test159 index 05968eb10e..fabcb4f986 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -50,16 +50,16 @@ debug http - + HTTP with NTLM authorization when talking HTTP/1.0 (known to fail) - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0 diff --git a/tests/data/test1590 b/tests/data/test1590 index dbb81cc29f..ea860215fe 100644 --- a/tests/data/test1590 +++ b/tests/data/test1590 @@ -34,9 +34,9 @@ Mime imap - + IMAP cleanup before a connection was created - + # tool is what to use instead of 'curl' lib1553 diff --git a/tests/data/test1592 b/tests/data/test1592 index 6da96dc492..e0adc0efc0 100644 --- a/tests/data/test1592 +++ b/tests/data/test1592 @@ -18,11 +18,11 @@ none lib%TESTNUMBER - + HTTP request, remove handle while resolving, don't block - + - + http://a-site-never-accessed.example.org/%TESTNUMBER diff --git a/tests/data/test16 b/tests/data/test16 index 240fd379cf..86fb55fb88 100644 --- a/tests/data/test16 +++ b/tests/data/test16 @@ -27,10 +27,10 @@ the content goes here http - + HTTP with proxy authorization - - + + -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x %HOSTIP:%HTTPPORT http://we.want.that.site.com/%TESTNUMBER diff --git a/tests/data/test160 b/tests/data/test160 index 32b0c73d52..e74a40b66a 100644 --- a/tests/data/test160 +++ b/tests/data/test160 @@ -34,10 +34,10 @@ wait 1 http - + HTTP with delayed close, conn reuse, connection reset and retry - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TESTNUMBER0001 diff --git a/tests/data/test1600 b/tests/data/test1600 index 33413d7c39..0705a0df37 100644 --- a/tests/data/test1600 +++ b/tests/data/test1600 @@ -16,8 +16,8 @@ none unittest NTLM - + NTLM unit tests - + diff --git a/tests/data/test1601 b/tests/data/test1601 index 2065fdd1d8..935f4e236d 100644 --- a/tests/data/test1601 +++ b/tests/data/test1601 @@ -15,8 +15,8 @@ none unittest - + MD5 unit tests - + diff --git a/tests/data/test1602 b/tests/data/test1602 index 56e243ff8a..546e8cbbde 100644 --- a/tests/data/test1602 +++ b/tests/data/test1602 @@ -15,8 +15,8 @@ none unittest - + Internal hash create/add/destroy testing, exercising clean functions - + diff --git a/tests/data/test1603 b/tests/data/test1603 index 406d197eeb..43cd3849d7 100644 --- a/tests/data/test1603 +++ b/tests/data/test1603 @@ -15,8 +15,8 @@ none unittest - + Internal hash add, retrieval, deletion testing - + diff --git a/tests/data/test1604 b/tests/data/test1604 index 39daf9ddc5..33e4e26c41 100644 --- a/tests/data/test1604 +++ b/tests/data/test1604 @@ -14,8 +14,8 @@ none unittest - + Test WIN32/MSDOS filename sanitization - + diff --git a/tests/data/test1605 b/tests/data/test1605 index a123b01a1d..d97c851787 100644 --- a/tests/data/test1605 +++ b/tests/data/test1605 @@ -14,8 +14,8 @@ none unittest - + Test negative data lengths as input to libcurl functions - + diff --git a/tests/data/test1606 b/tests/data/test1606 index 83e9844270..99104def2b 100644 --- a/tests/data/test1606 +++ b/tests/data/test1606 @@ -15,8 +15,8 @@ none unittest - + verify speedcheck - + diff --git a/tests/data/test1607 b/tests/data/test1607 index 6d28d6eb49..17f8a8159d 100644 --- a/tests/data/test1607 +++ b/tests/data/test1607 @@ -15,8 +15,8 @@ none unittest - + CURLOPT_RESOLVE parsing - + diff --git a/tests/data/test1608 b/tests/data/test1608 index d037508b84..c7d6a0a90c 100644 --- a/tests/data/test1608 +++ b/tests/data/test1608 @@ -16,8 +16,8 @@ none unittest shuffle-dns - + verify DNS shuffling - + diff --git a/tests/data/test1609 b/tests/data/test1609 index 6d28d6eb49..17f8a8159d 100644 --- a/tests/data/test1609 +++ b/tests/data/test1609 @@ -15,8 +15,8 @@ none unittest - + CURLOPT_RESOLVE parsing - + diff --git a/tests/data/test161 b/tests/data/test161 index 53508e4b5f..d8d7793761 100644 --- a/tests/data/test161 +++ b/tests/data/test161 @@ -21,10 +21,10 @@ PASV ftp - + FTP RETR PASV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test1610 b/tests/data/test1610 index fff973371d..8ee68d43c4 100644 --- a/tests/data/test1610 +++ b/tests/data/test1610 @@ -15,8 +15,8 @@ none unittest - + SHA256 unit tests - + diff --git a/tests/data/test1611 b/tests/data/test1611 index 008aea7ec4..ffd9de3cf4 100644 --- a/tests/data/test1611 +++ b/tests/data/test1611 @@ -15,8 +15,8 @@ none unittest - + MD4 unit tests - + diff --git a/tests/data/test1612 b/tests/data/test1612 index 3e92b67912..e186a4a56d 100644 --- a/tests/data/test1612 +++ b/tests/data/test1612 @@ -15,8 +15,8 @@ none unittest - + HMAC unit tests - + diff --git a/tests/data/test1614 b/tests/data/test1614 index 73bdbb4e00..2c4d6abe9f 100644 --- a/tests/data/test1614 +++ b/tests/data/test1614 @@ -15,9 +15,9 @@ none unittest proxy - + noproxy and cidr comparisons - + 0 diff --git a/tests/data/test162 b/tests/data/test162 index 3fa291de52..ec0cd2545a 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -34,10 +34,10 @@ proxy http - + HTTP GET asking for --proxy-ntlm when some other authentication is required - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --fail diff --git a/tests/data/test1620 b/tests/data/test1620 index 038bbcc1b4..32f50994f2 100644 --- a/tests/data/test1620 +++ b/tests/data/test1620 @@ -15,8 +15,8 @@ none unittest - + unit tests for url.c - + diff --git a/tests/data/test1621 b/tests/data/test1621 index 62c81052ff..953440f29e 100644 --- a/tests/data/test1621 +++ b/tests/data/test1621 @@ -16,8 +16,8 @@ none unittest https - + unit tests for stripcredentials from URL - + diff --git a/tests/data/test163 b/tests/data/test163 index e143f73aff..a3bf375309 100644 --- a/tests/data/test163 +++ b/tests/data/test163 @@ -26,10 +26,10 @@ Mime http - + HTTP multipart formpost with contents from a file - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<%LOGDIR/field%TESTNUMBER" -F tool=curl # We create this file before the command is invoked! diff --git a/tests/data/test1630 b/tests/data/test1630 index 4a983a9d58..35bc53fd41 100644 --- a/tests/data/test1630 +++ b/tests/data/test1630 @@ -28,10 +28,10 @@ the content goes here http https-proxy - + HTTPS-proxy with Basic auth to HTTP without auth - - + + -U fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong -x https://%HOSTIP:%HTTPSPROXYPORT http://we.want.that.site.com/%TESTNUMBER --proxy-insecure diff --git a/tests/data/test1631 b/tests/data/test1631 index 4c05987063..83bc83e42e 100644 --- a/tests/data/test1631 +++ b/tests/data/test1631 @@ -39,10 +39,10 @@ companions always called me. ftp https-proxy - + FTP through HTTPS-proxy - - + + -p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure diff --git a/tests/data/test1632 b/tests/data/test1632 index 830c5e8cb3..18674d21ba 100644 --- a/tests/data/test1632 +++ b/tests/data/test1632 @@ -48,10 +48,10 @@ mother knew what became of me. ftp https-proxy - + FTP through HTTPS-proxy, with connection reuse - - + + -p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test164 b/tests/data/test164 index 09310a0c28..83f7a107a1 100644 --- a/tests/data/test164 +++ b/tests/data/test164 @@ -44,10 +44,10 @@ Content-range: bytes 12-15/3781 http - + HTTP range with multiple ranges - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15 diff --git a/tests/data/test165 b/tests/data/test165 index dfd2131573..d0353946a2 100644 --- a/tests/data/test165 +++ b/tests/data/test165 @@ -38,10 +38,10 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + HTTP over proxy with IDN host name - - + + http://www.åäö.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT http://www.große.de/page/%TESTNUMBER diff --git a/tests/data/test1650 b/tests/data/test1650 index 6248b9814d..57a06f05e1 100644 --- a/tests/data/test1650 +++ b/tests/data/test1650 @@ -16,8 +16,8 @@ none unittest DoH - + DOH - + diff --git a/tests/data/test1651 b/tests/data/test1651 index d29974bf20..e552a8ad38 100644 --- a/tests/data/test1651 +++ b/tests/data/test1651 @@ -15,8 +15,8 @@ none unittest - + x509 parsing - + diff --git a/tests/data/test1655 b/tests/data/test1655 index e161fb6621..c5ec091292 100644 --- a/tests/data/test1655 +++ b/tests/data/test1655 @@ -16,8 +16,8 @@ none unittest DoH - + unit test for doh_encode - + diff --git a/tests/data/test166 b/tests/data/test166 index 58edaf094b..0951b2359d 100644 --- a/tests/data/test166 +++ b/tests/data/test166 @@ -26,10 +26,10 @@ Mime http - + HTTP formpost a file with spaces in name - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@%LOGDIR/fie ld %TESTNUMBER" # We create this file before the command is invoked! diff --git a/tests/data/test1661 b/tests/data/test1661 index 0e02d78d03..5a648e5155 100644 --- a/tests/data/test1661 +++ b/tests/data/test1661 @@ -15,8 +15,8 @@ none unittest - + bufref unit tests - + diff --git a/tests/data/test167 b/tests/data/test167 index 832cc35a6e..031b92077f 100644 --- a/tests/data/test167 +++ b/tests/data/test167 @@ -47,10 +47,10 @@ http crypto proxy - + HTTP with proxy-requiring-Basic to site-requiring-Digest - - + + http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --digest --user digest:alot diff --git a/tests/data/test168 b/tests/data/test168 index d552a71336..d6d4e895cb 100644 --- a/tests/data/test168 +++ b/tests/data/test168 @@ -61,10 +61,10 @@ http crypto proxy - + HTTP with proxy-requiring-Digest to site-requiring-Digest - - + + http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-digest --digest --user digest:alot diff --git a/tests/data/test17 b/tests/data/test17 index 8e5bf82677..67d2a9fcc7 100644 --- a/tests/data/test17 +++ b/tests/data/test17 @@ -22,9 +22,9 @@ This is the proof it works http - + HTTP with config file on stdin - + # # Use a silly request without '--': @@ -36,7 +36,7 @@ request MOOO # long option *with* '--': --max-time 180 - + -K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER diff --git a/tests/data/test170 b/tests/data/test170 index 22767cb5a6..f8c7357e68 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -24,10 +24,10 @@ SSL !SSPI proxy - + HTTP POST with --proxy-ntlm and no SSL with no response - - + + http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -F "dummy=value" diff --git a/tests/data/test1700 b/tests/data/test1700 index 7f78bcf5f9..8d1fff5801 100644 --- a/tests/data/test1700 +++ b/tests/data/test1700 @@ -45,10 +45,10 @@ h2c http http/2 - + HTTP/2 GET with Upgrade: - - + + http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUMBER0001 diff --git a/tests/data/test1701 b/tests/data/test1701 index 22f6147d05..c81862aeb5 100644 --- a/tests/data/test1701 +++ b/tests/data/test1701 @@ -36,10 +36,10 @@ h2c http http/2 - + HTTP/2 POST with Upgrade: - - + + http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend" diff --git a/tests/data/test1702 b/tests/data/test1702 index 1da9bc6b58..ced2ca06ce 100644 --- a/tests/data/test1702 +++ b/tests/data/test1702 @@ -35,10 +35,10 @@ h2c http http/2 - + HTTP/2 HEAD with Upgrade: - - + + http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head diff --git a/tests/data/test171 b/tests/data/test171 index d56296f4e6..a03ec8a688 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -27,10 +27,10 @@ This server reply is for testing a simple cookie test case... http - + HTTP, get cookie with dot prefixed full domain - - + + -c %LOGDIR/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER diff --git a/tests/data/test172 b/tests/data/test172 index e638fc42e0..3a9a9ed664 100644 --- a/tests/data/test172 +++ b/tests/data/test172 @@ -23,10 +23,10 @@ boo http - + HTTP with cookies file and custom added cookie - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b "tool=curl; name=fool" diff --git a/tests/data/test173 b/tests/data/test173 index e3d613e002..a4bffcd9a8 100644 --- a/tests/data/test173 +++ b/tests/data/test173 @@ -27,10 +27,10 @@ Mime http - + HTTP RFC1867-formpost a file from stdin with "faked" filename - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F field1=contents1 -F "fileupload=@-;filename=/dev/null;type=text/x-null;format=x-curl" diff --git a/tests/data/test174 b/tests/data/test174 index b0b7c5f7a4..a3d1d080aa 100644 --- a/tests/data/test174 +++ b/tests/data/test174 @@ -25,10 +25,10 @@ This is not the real page http - + HTTP POST --anyauth to server not requiring any auth at all - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelijunk" diff --git a/tests/data/test175 b/tests/data/test175 index 382e1a70bd..19537ebf3e 100644 --- a/tests/data/test175 +++ b/tests/data/test175 @@ -52,10 +52,10 @@ http crypto - + HTTP POST --digest to server not requiring any auth at all - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk" diff --git a/tests/data/test176 b/tests/data/test176 index 07ace476d6..eba8fef78c 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -54,10 +54,10 @@ SSL http - + HTTP POST --ntlm to server not requiring any auth at all - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk" diff --git a/tests/data/test177 b/tests/data/test177 index 6ee5fd06e0..528b722d6f 100644 --- a/tests/data/test177 +++ b/tests/data/test177 @@ -28,10 +28,10 @@ http crypto - + HTTP POST --digest to server doing a 302-location response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk" diff --git a/tests/data/test178 b/tests/data/test178 index 03c1a441d7..94ea47ecb3 100644 --- a/tests/data/test178 +++ b/tests/data/test178 @@ -33,10 +33,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT http - + HTTP response with negative Content-Length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test179 b/tests/data/test179 index 62a8d8c651..e3869b7fbf 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -27,10 +27,10 @@ This server says moo http - + HTTP using proxy and cookies with path checks - - + + http://supertrooper.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test18 b/tests/data/test18 index 888745889d..ae31da29e7 100644 --- a/tests/data/test18 +++ b/tests/data/test18 @@ -37,10 +37,10 @@ hoo http - + multiple requests using {} in URL - - + + "%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0002,%TESTNUMBER0003}" diff --git a/tests/data/test180 b/tests/data/test180 index dcb616fd05..62a505d5fa 100644 --- a/tests/data/test180 +++ b/tests/data/test180 @@ -23,10 +23,10 @@ blablabla http - + HTTP 1.0 PUT - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --http1.0 diff --git a/tests/data/test1800 b/tests/data/test1800 index 1f4472d9a1..de315d063c 100644 --- a/tests/data/test1800 +++ b/tests/data/test1800 @@ -32,10 +32,10 @@ http http/2 - + HTTP/2 upgrade refused - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2 diff --git a/tests/data/test1801 b/tests/data/test1801 index 9494e92d8a..a65a2d5d45 100644 --- a/tests/data/test1801 +++ b/tests/data/test1801 @@ -39,10 +39,10 @@ http http/2 - + HTTP/2 upgrade with lying server - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2 diff --git a/tests/data/test181 b/tests/data/test181 index 71dd427bf4..685b244129 100644 --- a/tests/data/test181 +++ b/tests/data/test181 @@ -23,10 +23,10 @@ blablabla http - + HTTP 1.0 POST - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @%LOGDIR/test%TESTNUMBER.txt --http1.0 diff --git a/tests/data/test183 b/tests/data/test183 index 77d9d04f7d..ba0df8c2fe 100644 --- a/tests/data/test183 +++ b/tests/data/test183 @@ -24,10 +24,10 @@ moo http - + HTTP GET two URLs over a single proxy with persistent connection - - + + http://deathstar.another.galaxy/%TESTNUMBER http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test184 b/tests/data/test184 index 9c795a2883..95c9e288b7 100644 --- a/tests/data/test184 +++ b/tests/data/test184 @@ -44,10 +44,10 @@ moo http - + HTTP replace Host: when following Location: to new host - - + + http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test185 b/tests/data/test185 index d614c10406..81093d2b06 100644 --- a/tests/data/test185 +++ b/tests/data/test185 @@ -44,10 +44,10 @@ moo http - + HTTP replace Host: when following Location: on the same host - - + + http://deathstar.another.galaxy/%TESTNUMBER -L -H "Host: another.visitor.stay.a.while.stay.foreeeeeever" --proxy http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test186 b/tests/data/test186 index ce1a2d1497..f5c071946f 100644 --- a/tests/data/test186 +++ b/tests/data/test186 @@ -27,10 +27,10 @@ Mime http - + HTTP RFC1867-type formposting with types on text fields - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo" -F "html= hello;type=text/html;charset=verymoo" # We create this file before the command is invoked! diff --git a/tests/data/test187 b/tests/data/test187 index 2d5d0a883c..aff3a9d1ad 100644 --- a/tests/data/test187 +++ b/tests/data/test187 @@ -50,10 +50,10 @@ If this is received, the location following worked http - + HTTP redirect with bad host name separation and slash in parameters - - + + http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L diff --git a/tests/data/test188 b/tests/data/test188 index 8e8848e65a..00d29990f8 100644 --- a/tests/data/test188 +++ b/tests/data/test188 @@ -47,10 +47,10 @@ Actual content http - + HTTP GET with resume and redirect - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L diff --git a/tests/data/test189 b/tests/data/test189 index e747d35268..f4ff1fa366 100644 --- a/tests/data/test189 +++ b/tests/data/test189 @@ -41,10 +41,10 @@ Content-Length: 15 http - + HTTP GET with resume and redirect (to a page that doesn't resume) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L diff --git a/tests/data/test19 b/tests/data/test19 index f053baf08b..265a74ad88 100644 --- a/tests/data/test19 +++ b/tests/data/test19 @@ -20,10 +20,10 @@ none http - + attempt connect to non-listening socket - - + + %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test190 b/tests/data/test190 index 61237ed0fe..b0328fdcb5 100644 --- a/tests/data/test190 +++ b/tests/data/test190 @@ -23,10 +23,10 @@ ftp ftp - + FTP download with strict timeout and slow CWD - - + + ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m %FTPTIME2 diff --git a/tests/data/test1903 b/tests/data/test1903 index ff5a0f29dd..d256e6223e 100644 --- a/tests/data/test1903 +++ b/tests/data/test1903 @@ -26,9 +26,9 @@ Set-Cookie: secondcookie=present; http - + CURLOPT_COOKIEFILE then reset then set again - + lib%TESTNUMBER diff --git a/tests/data/test1904 b/tests/data/test1904 index 5254c6379d..8f005365f6 100644 --- a/tests/data/test1904 +++ b/tests/data/test1904 @@ -47,10 +47,10 @@ contents http http-proxy - + HTTP CONNECT with 204 response - - + + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy %HOSTIP:%PROXYPORT diff --git a/tests/data/test1905 b/tests/data/test1905 index 308dc9a395..a17425e42d 100644 --- a/tests/data/test1905 +++ b/tests/data/test1905 @@ -26,9 +26,9 @@ Set-Cookie: secondcookie=present; http - + CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object - + lib%TESTNUMBER diff --git a/tests/data/test1906 b/tests/data/test1906 index 61cc04578a..6769d0cdb0 100644 --- a/tests/data/test1906 +++ b/tests/data/test1906 @@ -23,9 +23,9 @@ Funny-head: yesyes swsclose http - + CURLOPT_CURLU and CURLOPT_PORT - + lib%TESTNUMBER diff --git a/tests/data/test1907 b/tests/data/test1907 index 8536addde4..31a4cbc2d0 100644 --- a/tests/data/test1907 +++ b/tests/data/test1907 @@ -23,9 +23,9 @@ Content-Length: 0 http - + CURLINFO_EFFECTIVE_URL with non-scheme URL - + lib%TESTNUMBER diff --git a/tests/data/test1909 b/tests/data/test1909 index c412d41e06..2d868cc0bb 100644 --- a/tests/data/test1909 +++ b/tests/data/test1909 @@ -32,9 +32,9 @@ data http - + HTTP GET --retry-all-errors to overcome partial transfer - + --retry 1 --retry-all-errors -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test191 b/tests/data/test191 index e6e701173d..0293693631 100644 --- a/tests/data/test191 +++ b/tests/data/test191 @@ -17,10 +17,10 @@ data in file ftp - + FTP URL with ?-letters in username and password - - + + "ftp://use%3fr:pass%3fword@%HOSTIP:%FTPPORT/%TESTNUMBER" diff --git a/tests/data/test192 b/tests/data/test192 index 7edf316867..12ed68db64 100644 --- a/tests/data/test192 +++ b/tests/data/test192 @@ -25,10 +25,10 @@ monster http - + HTTP GET -w num_connects with one simple connect - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" diff --git a/tests/data/test193 b/tests/data/test193 index 4403b2c5e9..9e4dac0448 100644 --- a/tests/data/test193 +++ b/tests/data/test193 @@ -37,10 +37,10 @@ monster http - + HTTP GET -w num_connects with redirected fetch (2 connects) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L diff --git a/tests/data/test194 b/tests/data/test194 index 924e9a940b..4de767e3af 100644 --- a/tests/data/test194 +++ b/tests/data/test194 @@ -46,10 +46,10 @@ Connection: close http - + HTTP resume transfer with the whole file already downloaded and --fail - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail diff --git a/tests/data/test195 b/tests/data/test195 index 920ab8af32..be0c206d67 100644 --- a/tests/data/test195 +++ b/tests/data/test195 @@ -17,10 +17,10 @@ REPLY PASS 530 temporarily not available ftp - + FTP response 530 after PASS, temporarily not allowed access - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test196 b/tests/data/test196 index 715a6ce675..b1a684f108 100644 --- a/tests/data/test196 +++ b/tests/data/test196 @@ -18,10 +18,10 @@ REPLY PASS 430 temporarily not available ftp - + FTP transient error, retry request once - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1 diff --git a/tests/data/test197 b/tests/data/test197 index 3c5b8abff9..d940b0dc38 100644 --- a/tests/data/test197 +++ b/tests/data/test197 @@ -33,10 +33,10 @@ ok http - + HTTP GET --retry on 503 error with output to stdout - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000 diff --git a/tests/data/test198 b/tests/data/test198 index 08fafde6cd..95b1f99e1c 100644 --- a/tests/data/test198 +++ b/tests/data/test198 @@ -42,10 +42,10 @@ ok http - + HTTP GET --retry on 503 error with output to file - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000 diff --git a/tests/data/test199 b/tests/data/test199 index b997c5c4bb..1289fd2d9b 100644 --- a/tests/data/test199 +++ b/tests/data/test199 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP with -d, -G and {} - - + + -d "foo=moo&moo=poo" "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER}" -G diff --git a/tests/data/test2 b/tests/data/test2 index 80e47b082a..f9cef90a7d 100644 --- a/tests/data/test2 +++ b/tests/data/test2 @@ -25,10 +25,10 @@ Funny-head: yesyes http - + HTTP GET with user and password - - + + -u fake:user http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test20 b/tests/data/test20 index 910cb54c20..2384488067 100644 --- a/tests/data/test20 +++ b/tests/data/test20 @@ -21,10 +21,10 @@ none http - + attempt connect to non-existing host name - - + + --ipv4 non-existing-host.haxx.se. diff --git a/tests/data/test200 b/tests/data/test200 index 7ce2cbcfea..1a81ac8256 100644 --- a/tests/data/test200 +++ b/tests/data/test200 @@ -20,9 +20,9 @@ moo file - + basic file:// file - + file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2000 b/tests/data/test2000 index b114dd8aff..032bf5b1b4 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -28,9 +28,9 @@ works ftp file - + FTP RETR followed by FILE - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2001 b/tests/data/test2001 index f1e7146753..de16735313 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -45,9 +45,9 @@ http ftp file - + HTTP GET followed by FTP RETR followed by FILE - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2002 b/tests/data/test2002 index e06490b958..4b2b4fef69 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -54,9 +54,9 @@ ftp file tftp - + HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 diff --git a/tests/data/test2003 b/tests/data/test2003 index 9054a8d4a5..dcd8621789 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -54,9 +54,9 @@ ftp file tftp - + HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test2004 b/tests/data/test2004 index 80463569c6..404b354cec 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -26,9 +26,9 @@ for tftp test tftp sftp - + TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order - + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure diff --git a/tests/data/test201 b/tests/data/test201 index b68abb8c00..aff9ca2b81 100644 --- a/tests/data/test201 +++ b/tests/data/test201 @@ -17,10 +17,10 @@ FAILURE file - + missing file:// file - - + + file://localhost/%PWD/%LOGDIR/non-existent-file.txt diff --git a/tests/data/test202 b/tests/data/test202 index f2fb078f21..8c1f9964af 100644 --- a/tests/data/test202 +++ b/tests/data/test202 @@ -16,9 +16,9 @@ FILE file - + two file:// URLs to stdout - + file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2023 b/tests/data/test2023 index 08fb5cc008..e395ece9d6 100644 --- a/tests/data/test2023 +++ b/tests/data/test2023 @@ -109,16 +109,16 @@ http libauthretry - + HTTP authorization retry (Basic) - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic diff --git a/tests/data/test2024 b/tests/data/test2024 index d371e5dcbe..07bf931a22 100644 --- a/tests/data/test2024 +++ b/tests/data/test2024 @@ -123,16 +123,16 @@ crypto libauthretry - + HTTP authorization retry (Basic switching to Digest) - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest diff --git a/tests/data/test2026 b/tests/data/test2026 index 963587ef2e..81d252a305 100644 --- a/tests/data/test2026 +++ b/tests/data/test2026 @@ -159,16 +159,16 @@ crypto libauthretry - + HTTP authorization retry (Digest switching to Basic) - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic diff --git a/tests/data/test2027 b/tests/data/test2027 index ecc5a63d87..0a9338777f 100644 --- a/tests/data/test2027 +++ b/tests/data/test2027 @@ -182,16 +182,16 @@ crypto libauthretry - + HTTP authorization retry (Digest) - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest diff --git a/tests/data/test203 b/tests/data/test203 index 496a414825..ed388f6150 100644 --- a/tests/data/test203 +++ b/tests/data/test203 @@ -21,9 +21,9 @@ moo file - + file:/path URL with a single slash - + # Needed for MSYS2 to not convert MSYS2_ARG_CONV_EXCL=file: diff --git a/tests/data/test2033 b/tests/data/test2033 index 0645932a43..2a9f90091f 100644 --- a/tests/data/test2033 +++ b/tests/data/test2033 @@ -31,14 +31,14 @@ Schannel https Server-localhost-sv.pem - + simple HTTPS GET with DER public key pinning (Schannel variant) - + # This test is pointless if we're not using the schannel backend CURL_SSL_BACKEND=schannel - + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2034 b/tests/data/test2034 index 83f984a1d1..5192cb73ea 100644 --- a/tests/data/test2034 +++ b/tests/data/test2034 @@ -31,10 +31,10 @@ SSLpinning https Server-localhost-sv.pem - + simple HTTPS GET with DER public key pinning - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.der https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2035 b/tests/data/test2035 index 8380022aae..b17cddd567 100644 --- a/tests/data/test2035 +++ b/tests/data/test2035 @@ -22,10 +22,10 @@ SSLpinning https Server-localhost-sv.pem - + HTTPS wrong DER pinnedpubkey but right CN - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.der https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2036 b/tests/data/test2036 index f022d1444d..9fd89a2ac5 100644 --- a/tests/data/test2036 +++ b/tests/data/test2036 @@ -18,9 +18,9 @@ none http - + HTTP, -O with no slash at all in the URL - + %HOSTIP:%NOLISTENPORT -O diff --git a/tests/data/test2037 b/tests/data/test2037 index 2b17e53837..96406410aa 100644 --- a/tests/data/test2037 +++ b/tests/data/test2037 @@ -31,10 +31,10 @@ SSLpinning https Server-localhost-sv.pem - + simple HTTPS GET with PEM public key pinning - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2038 b/tests/data/test2038 index d9bf7c6434..6cd91d6231 100644 --- a/tests/data/test2038 +++ b/tests/data/test2038 @@ -22,10 +22,10 @@ SSLpinning https Server-localhost-sv.pem - + HTTPS wrong PEM pinnedpubkey but right CN - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pem https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2039 b/tests/data/test2039 index 25ecf278a6..fdb61ed024 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -33,10 +33,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP (optional .netrc with 'default' override; no user/pass) dir list PASV - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test204 b/tests/data/test204 index 63d17cd57d..ffe4657a7e 100644 --- a/tests/data/test204 +++ b/tests/data/test204 @@ -12,9 +12,9 @@ FILE file - + "upload" with file:// - + file://localhost%FILE_PWD/%LOGDIR/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt diff --git a/tests/data/test2041 b/tests/data/test2041 index f007f47c4c..b7b461e0d0 100644 --- a/tests/data/test2041 +++ b/tests/data/test2041 @@ -31,10 +31,10 @@ SSLpinning https Server-localhost-sv.pem - + simple HTTPS GET with base64-sha256 public key pinning - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//AAUDLk4c98xcFUDvA9i/MnA9HuO03IPi15r+Cx9OXnc= https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2042 b/tests/data/test2042 index b6b9bcc5ae..594a7e460a 100644 --- a/tests/data/test2042 +++ b/tests/data/test2042 @@ -22,10 +22,10 @@ SSLpinning https Server-localhost-sv.pem - + HTTPS wrong base64-sha256 pinnedpubkey but right CN - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//bSIggTf+ikMG0CtmDlpMVBd7yi7H1md4URogRPqerso= https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2043 b/tests/data/test2043 index 754a9b92ea..eb4387667f 100644 --- a/tests/data/test2043 +++ b/tests/data/test2043 @@ -15,10 +15,10 @@ Schannel none - + Disable certificate revocation checks - - + + --ssl-no-revoke -I https://revoked.badssl.com/ diff --git a/tests/data/test2046 b/tests/data/test2046 index 3882eb2db2..fc5ddca84e 100644 --- a/tests/data/test2046 +++ b/tests/data/test2046 @@ -48,11 +48,11 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + Connection reuse with IDN host name - + - + http://åäö.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L diff --git a/tests/data/test2047 b/tests/data/test2047 index e0e953189a..76bed3cc9d 100644 --- a/tests/data/test2047 +++ b/tests/data/test2047 @@ -49,11 +49,11 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + Connection reuse with IDN host name over HTTP proxy - + - + http://åäö.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}\n%{size_download}\n%{url_effective}\n%{content_type}\n%{response_code}\n" -L diff --git a/tests/data/test2049 b/tests/data/test2049 index 2b0c64508d..98be38bee6 100644 --- a/tests/data/test2049 +++ b/tests/data/test2049 @@ -26,11 +26,11 @@ OK http - + Connect to specific host - + - + http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next http://www2.example.com:8082/%TESTNUMBER --connect-to :8082:%HOSTIP:%HTTPPORT --next http://www3.example.com:8083/%TESTNUMBER --connect-to www3.example.com::%HOSTIP:%HTTPPORT --next http://www4.example.com:8084/%TESTNUMBER --connect-to www4.example.com:8084:%HOSTIP:%HTTPPORT diff --git a/tests/data/test205 b/tests/data/test205 index e2165ccd10..8239f63222 100644 --- a/tests/data/test205 +++ b/tests/data/test205 @@ -13,9 +13,9 @@ FAILURE file - + "upload" with file:// - + file://localhost/%PWD/%LOGDIR/nonexisting/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt diff --git a/tests/data/test2050 b/tests/data/test2050 index 8d63a8d4b1..3363fe55f9 100644 --- a/tests/data/test2050 +++ b/tests/data/test2050 @@ -46,11 +46,11 @@ OK http http-proxy - + Connect to specific host via HTTP proxy (switch to tunnel mode automatically) - + - + http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT diff --git a/tests/data/test2051 b/tests/data/test2051 index 2dcee0da1a..ce76cc93c0 100644 --- a/tests/data/test2051 +++ b/tests/data/test2051 @@ -26,11 +26,11 @@ OK http - + Connect to specific host: Reuse existing connections if possible - + - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to ::%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" diff --git a/tests/data/test2052 b/tests/data/test2052 index dd04f32607..a2a73e8ad3 100644 --- a/tests/data/test2052 +++ b/tests/data/test2052 @@ -27,11 +27,11 @@ OK http - + Connect to specific host: Do not mix connections with and without a "connect to host" - + - + http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT:%HOSTIP -w "%{num_connects}\n" --next --resolve -www.example.com:%HTTPPORT --connect-to ::%HOSTIP:%HTTPPORT http://www.example.com:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" diff --git a/tests/data/test2053 b/tests/data/test2053 index 41035eb594..a416d52868 100644 --- a/tests/data/test2053 +++ b/tests/data/test2053 @@ -26,11 +26,11 @@ OK http - + Connect to specific host with IP addresses - + - + http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next http://[fc00::1]:8082/%TESTNUMBER --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT diff --git a/tests/data/test2054 b/tests/data/test2054 index 022d132298..8217444e53 100644 --- a/tests/data/test2054 +++ b/tests/data/test2054 @@ -26,11 +26,11 @@ OK http - + Connect to specific host: use the first "connect-to" string that matches - + - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::456 --next http://www.example.com:%HTTPPORT/%TESTNUMBER --connect-to www.example.com::%HOSTIP: --connect-to www.example.com::foo: --next http://%HOSTIP:8083/%TESTNUMBER --connect-to :8083::%HTTPPORT --connect-to :8083::123 --next http://www.example.com:8084/%TESTNUMBER --connect-to www.example.com:8084:%HOSTIP:%HTTPPORT --connect-to www.example.com:8084:foo:123 diff --git a/tests/data/test2055 b/tests/data/test2055 index 2c62b259b1..66ddb084f1 100644 --- a/tests/data/test2055 +++ b/tests/data/test2055 @@ -48,13 +48,13 @@ http http-proxy socks5 - + Connect to specific host via SOCKS proxy and HTTP proxy (switch to tunnel mode automatically) - + proxy - + http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%HTTPPORT -x %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test2058 b/tests/data/test2058 index 7561c28fc4..4dfac74b7d 100644 --- a/tests/data/test2058 +++ b/tests/data/test2058 @@ -68,10 +68,10 @@ http crypto proxy - + HTTP POST --digest with PUT, resumed upload, modified method and SHA-256 - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test2059 b/tests/data/test2059 index 0bd5be8c97..e2957bce5d 100644 --- a/tests/data/test2059 +++ b/tests/data/test2059 @@ -68,10 +68,10 @@ http crypto proxy - + HTTP POST --digest with PUT, resumed upload, modified method, SHA-256 and userhash=true - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test206 b/tests/data/test206 index f92ff83573..19fbbfb4a5 100644 --- a/tests/data/test206 +++ b/tests/data/test206 @@ -75,10 +75,10 @@ http crypto proxy - + HTTP proxy CONNECT auth Digest - - + + http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel diff --git a/tests/data/test2060 b/tests/data/test2060 index 85637157be..dc4223ec61 100644 --- a/tests/data/test2060 +++ b/tests/data/test2060 @@ -68,10 +68,10 @@ http crypto proxy - + HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET diff --git a/tests/data/test2061 b/tests/data/test2061 index 702bc64dd9..d232f6251f 100644 --- a/tests/data/test2061 +++ b/tests/data/test2061 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 SHA256 Digest authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test2062 b/tests/data/test2062 index e05a42f66f..b6a1e01f93 100644 --- a/tests/data/test2062 +++ b/tests/data/test2062 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 SHA-512-256 Digest authorization and userhash=false - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test2063 b/tests/data/test2063 index 986a6ef6ab..f769428a95 100644 --- a/tests/data/test2063 +++ b/tests/data/test2063 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 SHA-256 Digest authorization and userhash=true - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test2064 b/tests/data/test2064 index 77810ec1dd..6d6fb14ace 100644 --- a/tests/data/test2064 +++ b/tests/data/test2064 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 Digest authorization with bad password and SHA256 - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest diff --git a/tests/data/test2065 b/tests/data/test2065 index 3d7afea250..0b794302df 100644 --- a/tests/data/test2065 +++ b/tests/data/test2065 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 Digest authorization with bad password, SHA-512-256 and userhash=false - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest diff --git a/tests/data/test2066 b/tests/data/test2066 index 4352afaf35..999f55ae4b 100644 --- a/tests/data/test2066 +++ b/tests/data/test2066 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with RFC7616 Digest authorization with bad password, SHA-256 and userhash=true - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest diff --git a/tests/data/test207 b/tests/data/test207 index 3719201eee..0c9bcaeb67 100644 --- a/tests/data/test207 +++ b/tests/data/test207 @@ -37,10 +37,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa http - + HTTP GET with chunked Transfer-Encoding closed prematurely - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test2070 b/tests/data/test2070 index 74cdd7d8c4..38b6ca89d0 100644 --- a/tests/data/test2070 +++ b/tests/data/test2070 @@ -30,14 +30,14 @@ Schannel https Server-localhost-sv.pem - + Ignore certificate revocation "best effort" strategy - + # This test is pointless if we're not using the schannel backend CURL_SSL_BACKEND=schannel - + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test2071 b/tests/data/test2071 index 45ee91737d..544893af57 100644 --- a/tests/data/test2071 +++ b/tests/data/test2071 @@ -20,9 +20,9 @@ moo file - + basic file:// file with "127.0.0.1" hostname - + file://127.0.0.1%FILE_PWD/%LOGDIR/test2070.txt diff --git a/tests/data/test2073 b/tests/data/test2073 index a8be75e7cd..8eea265536 100644 --- a/tests/data/test2073 +++ b/tests/data/test2073 @@ -33,10 +33,10 @@ Mime http - + HTTP form posts with handle reset - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=b;filename=b.jpg' diff --git a/tests/data/test2074 b/tests/data/test2074 index e7b6003381..1ef3480b5c 100644 --- a/tests/data/test2074 +++ b/tests/data/test2074 @@ -32,10 +32,10 @@ Funny-head: yesyes http - + HTTP GET - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test2079 b/tests/data/test2079 index 67ffa1656c..0164d1b3b3 100644 --- a/tests/data/test2079 +++ b/tests/data/test2079 @@ -31,14 +31,14 @@ Schannel https Server-localhost-sv.pem - + simple HTTPS GET with PEM public key pinning (Schannel variant) - + # This test is pointless if we're not using the schannel backend CURL_SSL_BACKEND=schannel - + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey %SRCDIR/certs/Server-localhost-sv.pub.pem --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test208 b/tests/data/test208 index f3ad620ee9..d2b3e15990 100644 --- a/tests/data/test208 +++ b/tests/data/test208 @@ -29,10 +29,10 @@ http ftp proxy - + HTTP PUT to a FTP URL with username+password - over HTTP proxy - - + + -x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test2080 b/tests/data/test2080 index 8b92c4f13a..7f08385b6f 100644 Binary files a/tests/data/test2080 and b/tests/data/test2080 differ diff --git a/tests/data/test2081 b/tests/data/test2081 index add9292522..0a95fb8813 100644 --- a/tests/data/test2081 +++ b/tests/data/test2081 @@ -32,10 +32,10 @@ Thanks for following. http - + Automatic referrer credential and anchor stripping check - - + + http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --referer ';auto' --write-out '%{referer}\n' diff --git a/tests/data/test2087 b/tests/data/test2087 index e0fa9ed1c0..eb8d3bad89 100644 --- a/tests/data/test2087 +++ b/tests/data/test2087 @@ -31,14 +31,14 @@ Schannel https Server-localhost-sv.pem - + simple HTTPS GET with base64-sha256 public key pinning (Schannel variant) - + # This test is pointless if we're not using the schannel backend CURL_SSL_BACKEND=schannel - + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --pinnedpubkey sha256//AAUDLk4c98xcFUDvA9i/MnA9HuO03IPi15r+Cx9OXnc= --ssl-revoke-best-effort https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test21 b/tests/data/test21 index 5c099cf34e..d98830e1d2 100644 --- a/tests/data/test21 +++ b/tests/data/test21 @@ -19,10 +19,10 @@ Mime http - + use curl with multiple request methods - - + + -I -d FOOO -F moo=moo localhost diff --git a/tests/data/test210 b/tests/data/test210 index 170316425b..1ee313d76a 100644 --- a/tests/data/test210 +++ b/tests/data/test210 @@ -19,9 +19,9 @@ data blobb ftp - + Get two FTP files from the same remote dir: no second CWD - + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER diff --git a/tests/data/test2100 b/tests/data/test2100 index 1fa0f23bf2..120a6af7af 100644 --- a/tests/data/test2100 +++ b/tests/data/test2100 @@ -51,10 +51,10 @@ debug DoH ipv6 - + HTTP GET using DoH - - + + http://foo.example.com:%HTTPPORT/%TESTNUMBER --doh-url http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test211 b/tests/data/test211 index 0fe6e6f96e..6830727ab6 100644 --- a/tests/data/test211 +++ b/tests/data/test211 @@ -20,10 +20,10 @@ REPLY EPSV 500 no such command ftp - + Get two FTP files with no remote EPSV support - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER diff --git a/tests/data/test212 b/tests/data/test212 index 175759a865..db0201e157 100644 --- a/tests/data/test212 +++ b/tests/data/test212 @@ -25,10 +25,10 @@ ftp ipv6 - + Get two FTP files with no remote EPRT support - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P - diff --git a/tests/data/test214 b/tests/data/test214 index bb3390f611..846b46458e 100644 --- a/tests/data/test214 +++ b/tests/data/test214 @@ -25,9 +25,9 @@ Funny-head: yesyes http - + HTTP URL with escaped { and } - + "http://%HOSTIP:%HTTPPORT/\{\}\/%TESTNUMBER" diff --git a/tests/data/test215 b/tests/data/test215 index 5fd8fc656b..cead9c742d 100644 --- a/tests/data/test215 +++ b/tests/data/test215 @@ -30,10 +30,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + Get two FTP dir listings from the same remote dir: no second CWD - - + + ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ diff --git a/tests/data/test216 b/tests/data/test216 index 82629f5915..1be87c0d1e 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -14,10 +14,10 @@ FTP ftp - + FTP upload two files to the same dir - - + + -T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER diff --git a/tests/data/test217 b/tests/data/test217 index d791416b03..cb6c6738b6 100644 --- a/tests/data/test217 +++ b/tests/data/test217 @@ -28,10 +28,10 @@ And you should ignore this data. http - + HTTP proxy CONNECT to proxy returning 405 - - + + http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n" diff --git a/tests/data/test218 b/tests/data/test218 index 3b67095bf0..cf9c41ad49 100644 --- a/tests/data/test218 +++ b/tests/data/test218 @@ -25,10 +25,10 @@ blaha http - + HTTP PUT from a file but enforce chunked transfer-encoding - - + + -T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test219 b/tests/data/test219 index 74a8551dae..2e965f366e 100644 --- a/tests/data/test219 +++ b/tests/data/test219 @@ -20,10 +20,10 @@ none http proxy - + try using proxy with unsupported scheme - - + + -x foo://%HOSTIP:%NOLISTENPORT/%TESTNUMBER http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER diff --git a/tests/data/test22 b/tests/data/test22 index 92fded6df1..b594a9cf74 100644 --- a/tests/data/test22 +++ b/tests/data/test22 @@ -21,10 +21,10 @@ This is the proof it works http - + get HTTP with URL > 10000 bytes - - + + %HOSTIP:%HTTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/%TESTNUMBER diff --git a/tests/data/test220 b/tests/data/test220 index 844bb02393..8b28ec0a3d 100644 --- a/tests/data/test220 +++ b/tests/data/test220 @@ -43,10 +43,10 @@ libz http - + HTTP GET gzip compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test221 b/tests/data/test221 index 2d769bcc76..79731628c3 100644 --- a/tests/data/test221 +++ b/tests/data/test221 @@ -43,10 +43,10 @@ libz http - + HTTP GET gzip compressed content with broken gzip header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test222 b/tests/data/test222 index 3f6e7c97f7..d5744ea80f 100644 --- a/tests/data/test222 +++ b/tests/data/test222 @@ -174,10 +174,10 @@ libz http - + HTTP GET deflate compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test223 b/tests/data/test223 index 4d0dddc115..3a2cf04054 100644 --- a/tests/data/test223 +++ b/tests/data/test223 @@ -64,10 +64,10 @@ libz http - + HTTP GET deflate compressed content with broken deflate header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test224 b/tests/data/test224 index 4fc84207c4..0b654c2e8c 100644 --- a/tests/data/test224 +++ b/tests/data/test224 @@ -79,10 +79,10 @@ libz http - + HTTP GET gzip compressed content with huge comment and extra field - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test225 b/tests/data/test225 index 5c8efd9d93..36fb2ef8ca 100644 --- a/tests/data/test225 +++ b/tests/data/test225 @@ -10,10 +10,10 @@ FAILURE ftp - + FTP %0a-code in URL's name part - - + + ftp://bad%0auser:passwd@%HOSTIP:%FTPPORT/%TESTNUMBER%0a diff --git a/tests/data/test226 b/tests/data/test226 index 9395457664..df0c4ac6f4 100644 --- a/tests/data/test226 +++ b/tests/data/test226 @@ -11,10 +11,10 @@ FAILURE ftp - + FTP %0d-code in URL's CWD part - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER%0d diff --git a/tests/data/test227 b/tests/data/test227 index 18622df589..f7b445185d 100644 --- a/tests/data/test227 +++ b/tests/data/test227 @@ -27,10 +27,10 @@ REPLY FAIL 500 this might not be a failure! ftp - + FTP with quote ops - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" diff --git a/tests/data/test228 b/tests/data/test228 index 7ac4ca49a3..8e7d73ff0c 100644 --- a/tests/data/test228 +++ b/tests/data/test228 @@ -26,10 +26,10 @@ REPLY ACCT 230 thank you ftp - + FTP RETR with ACCT - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" diff --git a/tests/data/test229 b/tests/data/test229 index 75dc10335e..71da135fc0 100644 --- a/tests/data/test229 +++ b/tests/data/test229 @@ -19,10 +19,10 @@ REPLY ACCT 532 bluah! ftp - + FTP RETR with bad ACCT - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" diff --git a/tests/data/test23 b/tests/data/test23 index 46872e82ea..1f15b218e1 100644 --- a/tests/data/test23 +++ b/tests/data/test23 @@ -16,10 +16,10 @@ FAILURE http - + unsupported protocol:// URL - - + + htfp://%HOSTIP:%HTTPPORT/none.htfml diff --git a/tests/data/test230 b/tests/data/test230 index a8c04be682..32b28e5b51 100644 --- a/tests/data/test230 +++ b/tests/data/test230 @@ -175,10 +175,10 @@ libz http - + HTTP GET multiply compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test2300 b/tests/data/test2300 index 997acfad29..fa620a1b1a 100644 --- a/tests/data/test2300 +++ b/tests/data/test2300 @@ -33,10 +33,10 @@ ws http - + WebSockets upgrade only - - + + ws://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test2306 b/tests/data/test2306 index e222dcc77a..620f7b5ecc 100644 --- a/tests/data/test2306 +++ b/tests/data/test2306 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + HTTP GET reused handle with first header folded - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test231 b/tests/data/test231 index 64bafa1763..e89346614e 100644 --- a/tests/data/test231 +++ b/tests/data/test231 @@ -19,9 +19,9 @@ C01234567 file - + file:// with resume - + file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt -C 10 diff --git a/tests/data/test232 b/tests/data/test232 index 32fdc6a350..025ce9f62e 100644 --- a/tests/data/test232 +++ b/tests/data/test232 @@ -174,10 +174,10 @@ libz http - + HTTP GET deflate raw-compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test233 b/tests/data/test233 index d089975862..e02be2a86e 100644 --- a/tests/data/test233 +++ b/tests/data/test233 @@ -61,10 +61,10 @@ contents http - + HTTP, proxy, site+proxy auth and Location: to new host - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location diff --git a/tests/data/test234 b/tests/data/test234 index 5e9258f509..f37d492b56 100644 --- a/tests/data/test234 +++ b/tests/data/test234 @@ -63,10 +63,10 @@ contents http - + HTTP, proxy, site+proxy auth and Location: to new host using location-trusted - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this --location-trusted diff --git a/tests/data/test235 b/tests/data/test235 index 3ff27cf261..4bfe7497ea 100644 --- a/tests/data/test235 +++ b/tests/data/test235 @@ -17,10 +17,10 @@ REPLY SIZE 500 command not understood ftp - + FTP resumed upload but no file present remotely - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - diff --git a/tests/data/test236 b/tests/data/test236 index 6f59e643e3..a66fa046d9 100644 --- a/tests/data/test236 +++ b/tests/data/test236 @@ -20,10 +20,10 @@ REPLY SIZE 500 command not understood ftp - + FTP resume upload but denied access to remote file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt -C - diff --git a/tests/data/test237 b/tests/data/test237 index 18ee6d951e..9e68651189 100644 --- a/tests/data/test237 +++ b/tests/data/test237 @@ -17,10 +17,10 @@ REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127) ftp - + FTP getting bad host in 227-response to PASV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv diff --git a/tests/data/test238 b/tests/data/test238 index 748ad46bfd..3c0db04413 100644 --- a/tests/data/test238 +++ b/tests/data/test238 @@ -17,10 +17,10 @@ REPLY EPSV 229 Entering Passiv Mode (|||1000000|) ftp - + FTP getting bad port in response to EPSV - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test24 b/tests/data/test24 index c275bfd012..888c635733 100644 --- a/tests/data/test24 +++ b/tests/data/test24 @@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it. http - + HTTP GET fail silently on HTTP error return - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error diff --git a/tests/data/test240 b/tests/data/test240 index 068a2eb60d..d033ae35ce 100644 --- a/tests/data/test240 +++ b/tests/data/test240 @@ -34,10 +34,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET - - + + -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" diff --git a/tests/data/test2400 b/tests/data/test2400 index 7f28f2f48c..e920f4f164 100644 --- a/tests/data/test2400 +++ b/tests/data/test2400 @@ -35,12 +35,12 @@ SSL http http/2 - + HTTP/2 GET - + - + -k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" diff --git a/tests/data/test2401 b/tests/data/test2401 index 667974e866..ef5fbb1818 100644 --- a/tests/data/test2401 +++ b/tests/data/test2401 @@ -33,12 +33,12 @@ SSL http http/2 - + HTTP/2 GET - + - + -k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" -d "moo" diff --git a/tests/data/test2402 b/tests/data/test2402 index 57a26b970b..44d48f85f2 100644 --- a/tests/data/test2402 +++ b/tests/data/test2402 @@ -57,10 +57,10 @@ http/2 lib%TESTNUMBER - + HTTP GET multiple over HTTP/2 - - + + https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT diff --git a/tests/data/test2403 b/tests/data/test2403 index 11aa74b59b..7a993d731b 100644 --- a/tests/data/test2403 +++ b/tests/data/test2403 @@ -37,12 +37,12 @@ headers-api http http/2 - + HTTP/2 GET - + - + -k --http2 -w '%{header_json}\n' "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" diff --git a/tests/data/test2404 b/tests/data/test2404 index 0e22bfe5f5..bcf1035aaf 100644 --- a/tests/data/test2404 +++ b/tests/data/test2404 @@ -57,10 +57,10 @@ http/2 lib%TESTNUMBER - + HTTP/2 using STREAM_WEIGHTs - - + + https://%HOSTIP:%HTTP2TLSPORT/path/%TESTNUMBER %HOSTIP %HTTP2TLSPORT diff --git a/tests/data/test241 b/tests/data/test241 index 8fb619cac7..92a431420d 100644 --- a/tests/data/test241 +++ b/tests/data/test241 @@ -29,10 +29,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET (using ip6-localhost) - - + + -g "http://ip6-localhost:%HTTP6PORT/%TESTNUMBER" diff --git a/tests/data/test242 b/tests/data/test242 index 504555923c..a498ab29b7 100644 --- a/tests/data/test242 +++ b/tests/data/test242 @@ -29,10 +29,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET with username+password in URL - - + + -g "http://foobar:barfoo@%HOST6IP:%HTTP6PORT/%TESTNUMBER" diff --git a/tests/data/test244 b/tests/data/test244 index 6755994d5e..782be2be40 100644 --- a/tests/data/test244 +++ b/tests/data/test244 @@ -31,10 +31,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP dir listing with nocwd and URL encoded path - - + + --ftp-method nocwd ftp://%HOSTIP:%FTPPORT/fir%23t/th%69rd/%TESTNUMBER/ diff --git a/tests/data/test245 b/tests/data/test245 index 569b4107de..78893f028e 100644 --- a/tests/data/test245 +++ b/tests/data/test245 @@ -53,10 +53,10 @@ http !SSPI crypto - + HTTP POST --digest - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk" diff --git a/tests/data/test246 b/tests/data/test246 index 383d07d9a6..a756028b9c 100644 --- a/tests/data/test246 +++ b/tests/data/test246 @@ -63,10 +63,10 @@ http !SSPI crypto - + HTTP POST --digest with server doing a 100 before 401 response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk" diff --git a/tests/data/test247 b/tests/data/test247 index d51034c9e3..40f42e7d06 100644 --- a/tests/data/test247 +++ b/tests/data/test247 @@ -16,9 +16,9 @@ FTP ftp - + FTP upload time condition evaluates TRUE => skip upload - + data to @@ -27,7 +27,7 @@ that FTP works so does it? - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" diff --git a/tests/data/test248 b/tests/data/test248 index 4d4c1a69e9..097e1e5839 100644 --- a/tests/data/test248 +++ b/tests/data/test248 @@ -16,9 +16,9 @@ FTP ftp - + FTP upload time condition evaluates FALSE => upload anyway - + data to @@ -27,7 +27,7 @@ that FTP works so does it? - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" diff --git a/tests/data/test249 b/tests/data/test249 index 6a2dd2c874..82b0a1406c 100644 --- a/tests/data/test249 +++ b/tests/data/test249 @@ -29,10 +29,10 @@ Content-Type: text/html http - + HTTP 304 response with "illegal" Content-Length: header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT" diff --git a/tests/data/test25 b/tests/data/test25 index 61080ca397..b00ef84ece 100644 --- a/tests/data/test25 +++ b/tests/data/test25 @@ -63,10 +63,10 @@ Connection: close http - + looping HTTP Location: following with --max-redirs - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5 diff --git a/tests/data/test250 b/tests/data/test250 index b1879f252d..3c16fcd7b4 100644 --- a/tests/data/test250 +++ b/tests/data/test250 @@ -35,10 +35,10 @@ SLOWDOWN ftp - + FTP dir list PASV with slow response - - + + ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test2500 b/tests/data/test2500 index 0290a32399..6ec739d1ac 100644 --- a/tests/data/test2500 +++ b/tests/data/test2500 @@ -36,10 +36,10 @@ nghttpx-h3 http http/3 - + HTTP/3 GET: - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --http3 --resolve localhost:%HTTP3PORT:%HOSTIP https://localhost:%HTTP3PORT/%TESTNUMBER diff --git a/tests/data/test2501 b/tests/data/test2501 index e7013e5ee7..4db52ecf6c 100644 --- a/tests/data/test2501 +++ b/tests/data/test2501 @@ -33,12 +33,12 @@ http/3 http http/3 - + HTTP/3 POST - + - + -k --http3 "https://%HOSTIP:%HTTP3PORT/%TESTNUMBER" -d "moo" diff --git a/tests/data/test2502 b/tests/data/test2502 index 5e4a0fd0b3..aae65e1cc1 100644 --- a/tests/data/test2502 +++ b/tests/data/test2502 @@ -56,10 +56,10 @@ http/3 lib%TESTNUMBER - + HTTP GET multiple over HTTP/3 - - + + https://%HOSTIP:%HTTP3PORT/path/%TESTNUMBER %HOSTIP %HTTP3PORT diff --git a/tests/data/test2503 b/tests/data/test2503 index 550eb8a22e..9877ee4c1b 100644 --- a/tests/data/test2503 +++ b/tests/data/test2503 @@ -36,12 +36,12 @@ headers-api http http/3 - + HTTP/3 header-api - + - + -w '%{header_json}\n' --http3-only --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --resolve localhost:%HTTP3PORT:%HOSTIP https://localhost:%HTTP3PORT/%TESTNUMBER diff --git a/tests/data/test251 b/tests/data/test251 index 04ad017096..46124bfeca 100644 --- a/tests/data/test251 +++ b/tests/data/test251 @@ -33,10 +33,10 @@ SLOWDOWN ftp - + FTP dir list, PORT with specified IP and slow response - - + + ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP diff --git a/tests/data/test252 b/tests/data/test252 index 559ece0c98..220cda1899 100644 --- a/tests/data/test252 +++ b/tests/data/test252 @@ -36,10 +36,10 @@ ipv6 ftp-ipv6 - + FTP IPv6 dir list PASV - - + + -g "ftp://%HOST6IP:%FTP6PORT/" diff --git a/tests/data/test253 b/tests/data/test253 index 8974a8b073..2c1008d7e5 100644 --- a/tests/data/test253 +++ b/tests/data/test253 @@ -36,10 +36,10 @@ ipv6 ftp-ipv6 - + FTP IPv6 dir list with EPRT - - + + -g "ftp://%HOST6IP:%FTP6PORT/" -P - diff --git a/tests/data/test254 b/tests/data/test254 index a9ea0cceea..30978758f7 100644 --- a/tests/data/test254 +++ b/tests/data/test254 @@ -37,10 +37,10 @@ ipv6 ftp-ipv6 - + FTP IPv6 dir list PASV and --disable-epsv - - + + -g "ftp://%HOST6IP:%FTP6PORT/" --disable-epsv diff --git a/tests/data/test255 b/tests/data/test255 index 79d43af7c5..37b9da2acf 100644 --- a/tests/data/test255 +++ b/tests/data/test255 @@ -37,10 +37,10 @@ ipv6 ftp-ipv6 - + FTP IPv6 dir list with EPRT and --disable-eprt - - + + -g "ftp://%HOST6IP:%FTP6PORT/" -P - --disable-eprt diff --git a/tests/data/test256 b/tests/data/test256 index cbb8714649..f370d73ab9 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -25,9 +25,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-) http - + HTTP resume request over proxy with auth without server supporting it - + -x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt -U daniel:stenberg diff --git a/tests/data/test257 b/tests/data/test257 index ac38ac5fbd..5eabf363ad 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -67,10 +67,10 @@ If this is received, the location following worked http - + HTTP Location: following with --netrc-optional - - + + http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER diff --git a/tests/data/test258 b/tests/data/test258 index e925e66b1f..69f2613f5f 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -61,10 +61,10 @@ Mime crypto proxy - + HTTP POST multipart without Expect: header using proxy anyauth (Digest) - - + + -x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth # We create this file before the command is invoked! diff --git a/tests/data/test259 b/tests/data/test259 index b3cb8275eb..b3796cef37 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -57,10 +57,10 @@ Mime crypto proxy - + HTTP POST multipart with Expect: header using proxy anyauth (Digest) - - + + -x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue" # We create this file before the command is invoked! diff --git a/tests/data/test26 b/tests/data/test26 index cd8ba426cc..9e334bc5b5 100644 --- a/tests/data/test26 +++ b/tests/data/test26 @@ -21,10 +21,10 @@ Connection: close http - + specify more -o than URLs - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o - diff --git a/tests/data/test260 b/tests/data/test260 index b706e60b5f..7793b7646a 100644 --- a/tests/data/test260 +++ b/tests/data/test260 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP GET URL without slash but with questionmark - - + + "http://%HOSTIP:%HTTPPORT?%TESTNUMBER" diff --git a/tests/data/test2600 b/tests/data/test2600 index 829ea0c6fe..5b88aedb7d 100644 --- a/tests/data/test2600 +++ b/tests/data/test2600 @@ -18,8 +18,8 @@ unittest debug http - + connection filter connect/destroy unit tests - + diff --git a/tests/data/test2601 b/tests/data/test2601 index 1ca0b9c830..778f6c54a7 100644 --- a/tests/data/test2601 +++ b/tests/data/test2601 @@ -15,8 +15,8 @@ none unittest - + bufq unit tests - + diff --git a/tests/data/test2602 b/tests/data/test2602 index e811f29c27..798cd02c04 100644 --- a/tests/data/test2602 +++ b/tests/data/test2602 @@ -15,8 +15,8 @@ none unittest - + dynhds unit tests - + diff --git a/tests/data/test2603 b/tests/data/test2603 index dfb3735ee2..c8845bb2e1 100644 --- a/tests/data/test2603 +++ b/tests/data/test2603 @@ -15,8 +15,8 @@ none unittest - + http1 parser unit tests - + diff --git a/tests/data/test261 b/tests/data/test261 index 8a68ba9cd6..d5f940372e 100644 --- a/tests/data/test261 +++ b/tests/data/test261 @@ -23,10 +23,10 @@ REPLY TYPE 226 Kind of on the positive side! ftp - + FTP RETR with 226 response code to TYPE - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test262 b/tests/data/test262 index d119d66723..ef9c731f5e 100644 Binary files a/tests/data/test262 and b/tests/data/test262 differ diff --git a/tests/data/test263 b/tests/data/test263 index 7a2bff9ecd..93e98a1970 100644 --- a/tests/data/test263 +++ b/tests/data/test263 @@ -30,10 +30,10 @@ proxy http-ipv6 - + HTTP-IPv6 GET with proxy specified using IPv6-numerical address - - + + -g -x "http://%HOST6IP:%HTTP6PORT" http://veryveryremotesite.com/%TESTNUMBER diff --git a/tests/data/test264 b/tests/data/test264 index c4c3652998..a4ce251524 100644 --- a/tests/data/test264 +++ b/tests/data/test264 @@ -24,10 +24,10 @@ the content would go here http - + HTTP with proxy string including http:// and user+password - - + + http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:user@%HOSTIP:%HTTPPORT diff --git a/tests/data/test266 b/tests/data/test266 index d30c70aac6..8604c609b8 100644 --- a/tests/data/test266 +++ b/tests/data/test266 @@ -49,10 +49,10 @@ writedelay: 10 http - + HTTP GET with chunked Transfer-Encoding and chunked trailer - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER diff --git a/tests/data/test269 b/tests/data/test269 index 36014c808b..724fa4dc97 100644 --- a/tests/data/test269 +++ b/tests/data/test269 @@ -32,10 +32,10 @@ muahahaha http - + HTTP --ignore-content-length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length diff --git a/tests/data/test27 b/tests/data/test27 index fba169510f..75c73acc2b 100644 --- a/tests/data/test27 +++ b/tests/data/test27 @@ -23,10 +23,10 @@ Content-Length: 8 http - + Get same cookie page several times - - + + "http://%HOSTIP:%HTTPPORT/want/{%TESTNUMBER,%TESTNUMBER,%TESTNUMBER}" -b none diff --git a/tests/data/test270 b/tests/data/test270 index 983e0d2b7f..efa183f155 100644 --- a/tests/data/test270 +++ b/tests/data/test270 @@ -26,10 +26,10 @@ PASVBADIP ftp - + FTP RETR PASV --ftp-skip-pasv-ip - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv diff --git a/tests/data/test271 b/tests/data/test271 index a825198757..2903ccf23b 100644 --- a/tests/data/test271 +++ b/tests/data/test271 @@ -23,10 +23,10 @@ returned tftp - + TFTP retrieve - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER diff --git a/tests/data/test272 b/tests/data/test272 index 90f9e41987..2857c3eac3 100644 --- a/tests/data/test272 +++ b/tests/data/test272 @@ -18,10 +18,10 @@ RETR ftp - + FTP timed conditioned get file with identical time stamp - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC" diff --git a/tests/data/test273 b/tests/data/test273 index b2b023a607..4dc23e0dd5 100644 --- a/tests/data/test273 +++ b/tests/data/test273 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with two Digest authorization headers - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test274 b/tests/data/test274 index b0f74b4944..bb72006148 100644 --- a/tests/data/test274 +++ b/tests/data/test274 @@ -24,10 +24,10 @@ Connection: close http - + HTTP Location: following with --max-redirs 0 - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0 diff --git a/tests/data/test275 b/tests/data/test275 index c6b6b566e6..d0abcac184 100644 --- a/tests/data/test275 +++ b/tests/data/test275 @@ -50,10 +50,10 @@ contents http http-proxy - + HTTP CONNECT with proxytunnel getting two URLs from the same host - - + + http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER diff --git a/tests/data/test276 b/tests/data/test276 index 07a1aaed17..6814f9ed7b 100644 --- a/tests/data/test276 +++ b/tests/data/test276 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + HTTP Location: following with multiple question marks in URLs - - + + "http://%HOSTIP:%HTTPPORT/want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER" -L diff --git a/tests/data/test277 b/tests/data/test277 index 1e091e3ddd..69a17fea5e 100644 --- a/tests/data/test277 +++ b/tests/data/test277 @@ -26,10 +26,10 @@ Mime http - + HTTP RFC1867-type formposting with custom Content-Type - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/info" diff --git a/tests/data/test278 b/tests/data/test278 index 7cbd4704b1..e2daab39f0 100644 --- a/tests/data/test278 +++ b/tests/data/test278 @@ -24,10 +24,10 @@ the content would go here http - + HTTP with proxy string including http:// and user+empty password - - + + http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke:@%HOSTIP:%HTTPPORT diff --git a/tests/data/test279 b/tests/data/test279 index cc919224d5..740e351de7 100644 --- a/tests/data/test279 +++ b/tests/data/test279 @@ -25,10 +25,10 @@ the content would go here http - + HTTP with proxy string including http:// and user only - - + + http://we.want.that.site.com/%TESTNUMBER -x http://f%61ke@%HOSTIP:%HTTPPORT diff --git a/tests/data/test28 b/tests/data/test28 index 1966cc8630..24815a2c2c 100644 --- a/tests/data/test28 +++ b/tests/data/test28 @@ -52,10 +52,10 @@ If this is received, the location following worked http - + HTTP Location: following with extra spaces in header - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L diff --git a/tests/data/test280 b/tests/data/test280 index 71c147ce46..1ed41e6528 100644 --- a/tests/data/test280 +++ b/tests/data/test280 @@ -37,10 +37,10 @@ COUNT USER 1 ftp - + FTP --ftp-alternative-to-user on USER failure - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement" diff --git a/tests/data/test281 b/tests/data/test281 index 06ca27b7c3..23af513a02 100644 --- a/tests/data/test281 +++ b/tests/data/test281 @@ -24,10 +24,10 @@ Server: test-server/fake http - + HTTP PUT from file with 100 + 401 responses and -f without auth given - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test282 b/tests/data/test282 index 4fb9e598e5..68d3b428cb 100644 --- a/tests/data/test282 +++ b/tests/data/test282 @@ -21,10 +21,10 @@ HTTP/1.1 200 OK swsclose http - + HTTP GET with no response body or headers - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test283 b/tests/data/test283 index 0f2d0089a6..bf8cc3a919 100644 --- a/tests/data/test283 +++ b/tests/data/test283 @@ -13,10 +13,10 @@ FAILURE tftp - + TFTP retrieve on invalid file - - + + tftp://%HOSTIP:%TFTPPORT//invalid-file --tftp-blksize 1024 diff --git a/tests/data/test284 b/tests/data/test284 index a18f4929e5..9681e56952 100644 --- a/tests/data/test284 +++ b/tests/data/test284 @@ -47,10 +47,10 @@ condition in the TFTP receive code. tftp - + TFTP retrieve of boundary case 512 byte file - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER diff --git a/tests/data/test285 b/tests/data/test285 index 8cb479a129..7968e1a34c 100644 --- a/tests/data/test285 +++ b/tests/data/test285 @@ -12,10 +12,10 @@ TFTP WRQ tftp - + TFTP send - - + + -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --connect-time 549 diff --git a/tests/data/test286 b/tests/data/test286 index d51ec10622..e5f09bfd5a 100644 --- a/tests/data/test286 +++ b/tests/data/test286 @@ -12,10 +12,10 @@ TFTP WRQ tftp - + TFTP send of boundary case 512 byte file - - + + -T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// diff --git a/tests/data/test287 b/tests/data/test287 index 71ab8d527d..85d557ec96 100644 --- a/tests/data/test287 +++ b/tests/data/test287 @@ -24,10 +24,10 @@ And you should ignore this data. http - + HTTP proxy CONNECT with custom User-Agent header - - + + http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER -H "User-Agent: looser/2015" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel --proxy-header "User-Agent: looser/2007" diff --git a/tests/data/test288 b/tests/data/test288 index 164cf20e76..a341df61fb 100644 --- a/tests/data/test288 +++ b/tests/data/test288 @@ -24,9 +24,9 @@ none file - + file:// with (unsupported) proxy, authentication and range - + all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/ diff --git a/tests/data/test289 b/tests/data/test289 index 4b80c908cb..dff384bfe7 100644 --- a/tests/data/test289 +++ b/tests/data/test289 @@ -13,10 +13,10 @@ FAILURE ftp - + FTP resume upload but denied access to local file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/illegal-nonexistent-file -C - diff --git a/tests/data/test29 b/tests/data/test29 index bb9916e83b..64d5e6c6bf 100644 --- a/tests/data/test29 +++ b/tests/data/test29 @@ -26,10 +26,10 @@ wait 10 http - + HTTP with 2 secs timeout - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2 diff --git a/tests/data/test290 b/tests/data/test290 index 9e59311523..e7048a5384 100644 --- a/tests/data/test290 +++ b/tests/data/test290 @@ -17,10 +17,10 @@ FTP ftp - + FTP download maximum filesize exceeded - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30 diff --git a/tests/data/test291 b/tests/data/test291 index 45f041e2e4..05cc2b444a 100644 --- a/tests/data/test291 +++ b/tests/data/test291 @@ -23,10 +23,10 @@ works ftp - + FTP download maximum filesize not exceeded - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100 diff --git a/tests/data/test292 b/tests/data/test292 index 91e2d66705..0ae74a9bc0 100644 --- a/tests/data/test292 +++ b/tests/data/test292 @@ -32,10 +32,10 @@ Funny-head: yesyes http - + HTTP GET with maximum filesize not exceeded - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000 diff --git a/tests/data/test293 b/tests/data/test293 index aaeefc4579..04f9899910 100644 --- a/tests/data/test293 +++ b/tests/data/test293 @@ -33,10 +33,10 @@ Funny-head: yesyes http - + HTTP GET with maximum filesize exceeded - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2 diff --git a/tests/data/test294 b/tests/data/test294 index 4dc90e3683..b840b8c70f 100644 --- a/tests/data/test294 +++ b/tests/data/test294 @@ -38,10 +38,10 @@ REPLY ACCT 230 Thank-you for the ACCT ftp - + FTP --ftp-account on ACCT request - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct" diff --git a/tests/data/test295 b/tests/data/test295 index 206c1ab744..ebb1a36976 100644 --- a/tests/data/test295 +++ b/tests/data/test295 @@ -23,10 +23,10 @@ REPLY PWD 530 No ACCT, go away ftp - + FTP ACCT request without --ftp-account - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ diff --git a/tests/data/test296 b/tests/data/test296 index 3c36a16089..c88ec99bf7 100644 --- a/tests/data/test296 +++ b/tests/data/test296 @@ -21,10 +21,10 @@ bla bla bla ftp - + FTP CWD with --ftp-method multicwd - - + + --ftp-method multicwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER diff --git a/tests/data/test297 b/tests/data/test297 index e4cdd856c5..99c10d3e13 100644 --- a/tests/data/test297 +++ b/tests/data/test297 @@ -21,10 +21,10 @@ bla bla bla ftp - + FTP CWD with --ftp-method singlecwd - - + + --ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/first/second/third/%TESTNUMBER diff --git a/tests/data/test298 b/tests/data/test298 index 20c8eccf27..5188c85477 100644 --- a/tests/data/test298 +++ b/tests/data/test298 @@ -21,10 +21,10 @@ bla bla bla ftp - + FTP CWD with --ftp-method nocwd - - + + --ftp-method nocwd ftp://%HOSTIP:%FTPPORT/first/second/th%69rd/%TESTNUMBER diff --git a/tests/data/test299 b/tests/data/test299 index 9b3fd0c30e..fc80c6296f 100644 --- a/tests/data/test299 +++ b/tests/data/test299 @@ -29,10 +29,10 @@ http ftp proxy - + FTP over HTTP proxy with user:pass not in url - - + + -x http://%HOSTIP:%HTTPPORT -u michal:aybabtu ftp://host.com/we/want/%TESTNUMBER diff --git a/tests/data/test3 b/tests/data/test3 index f28d0ccd43..6c5eb6b712 100644 --- a/tests/data/test3 +++ b/tests/data/test3 @@ -32,10 +32,10 @@ Content-Length: 0 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:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test30 b/tests/data/test30 index 2a84b4c36c..6d6a7f6452 100644 --- a/tests/data/test30 +++ b/tests/data/test30 @@ -17,10 +17,10 @@ FAILURE http - + HTTP with no data in server reply - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER diff --git a/tests/data/test300 b/tests/data/test300 index efbf97fe37..2eb5f11a6f 100644 --- a/tests/data/test300 +++ b/tests/data/test300 @@ -28,10 +28,10 @@ SSL https - + simple HTTPS GET - - + + -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test3002 b/tests/data/test3002 index b6c94ec3ce..a956913a2a 100644 --- a/tests/data/test3002 +++ b/tests/data/test3002 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple and invalid (first) --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test3003 b/tests/data/test3003 index 23e86c05ec..28dd7f8084 100644 --- a/tests/data/test3003 +++ b/tests/data/test3003 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple and invalid (last) --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt invalid.five --mail-from sender@example.com -T - diff --git a/tests/data/test3004 b/tests/data/test3004 index 1f646eeaba..d46ba6ccc7 100644 --- a/tests/data/test3004 +++ b/tests/data/test3004 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple and invalid (middle) --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test3005 b/tests/data/test3005 index ffaa475bd9..2f829f446c 100644 --- a/tests/data/test3005 +++ b/tests/data/test3005 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple and invalid (all but one) --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt recipient.two@example.com --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T - diff --git a/tests/data/test3006 b/tests/data/test3006 index 9753d74fc0..5ebf0bdf16 100644 --- a/tests/data/test3006 +++ b/tests/data/test3006 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple invalid (all) --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from sender@example.com -T - diff --git a/tests/data/test3007 b/tests/data/test3007 index 74497ed12f..9a4aede6f8 100644 --- a/tests/data/test3007 +++ b/tests/data/test3007 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with invalid --mail-rcpt and --mail-rcpt-allowfails - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from sender@example.com -T - diff --git a/tests/data/test301 b/tests/data/test301 index 167a718aba..a073011819 100644 --- a/tests/data/test301 +++ b/tests/data/test301 @@ -29,10 +29,10 @@ SSL https - + HTTPS GET with user and password - - + + -k -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test3015 b/tests/data/test3015 index 523d06a084..5b59bba320 100644 --- a/tests/data/test3015 +++ b/tests/data/test3015 @@ -46,10 +46,10 @@ monster http - + HTTP GET -w num_headers with redirected fetch (2 connects) - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o/dev/null diff --git a/tests/data/test302 b/tests/data/test302 index 755d4b224f..f6f33c276c 100644 --- a/tests/data/test302 +++ b/tests/data/test302 @@ -29,10 +29,10 @@ proxy https - + HTTPS GET over HTTP proxy fails - - + + -k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER diff --git a/tests/data/test3021 b/tests/data/test3021 index cc126773ee..bdf8f375cf 100644 --- a/tests/data/test3021 +++ b/tests/data/test3021 @@ -24,10 +24,10 @@ libssh2 sftp - + SFTP correct sha256 host key - - + + --hostpubsha256 %SSHSRVSHA256 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test3022 b/tests/data/test3022 index 45cdf87949..d76e5f4936 100644 --- a/tests/data/test3022 +++ b/tests/data/test3022 @@ -24,10 +24,10 @@ libssh2 scp - + SCP correct sha256 host key - - + + --hostpubsha256 %SSHSRVSHA256 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test3027 b/tests/data/test3027 index 6d7aeb620b..05a811f4e8 100644 --- a/tests/data/test3027 +++ b/tests/data/test3027 @@ -24,9 +24,9 @@ data blobb ftp - + Get a file via FTP but 550 after MDTM command - + lib3027 diff --git a/tests/data/test303 b/tests/data/test303 index ea48b508f6..9b656a7951 100644 --- a/tests/data/test303 +++ b/tests/data/test303 @@ -33,10 +33,10 @@ https https - + HTTPS with 8 secs timeout - - + + -k https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8 diff --git a/tests/data/test304 b/tests/data/test304 index 8e7c7246c5..f5ba5153c3 100644 --- a/tests/data/test304 +++ b/tests/data/test304 @@ -27,10 +27,10 @@ SSL https - + HTTPS multipart formpost - - + + -k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! diff --git a/tests/data/test305 b/tests/data/test305 index 4ca5789ed7..9e7dc8dcb0 100644 --- a/tests/data/test305 +++ b/tests/data/test305 @@ -15,10 +15,10 @@ SSL https - + insecure HTTPS without permission - - + + https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER --cacert moooo diff --git a/tests/data/test306 b/tests/data/test306 index ee88702411..a7e477e4de 100644 --- a/tests/data/test306 +++ b/tests/data/test306 @@ -42,10 +42,10 @@ SSL https - + HTTPS GET, receive no headers only data! - - + + -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test307 b/tests/data/test307 index 4c004ae1cc..ce3232ac7f 100644 --- a/tests/data/test307 +++ b/tests/data/test307 @@ -32,10 +32,10 @@ https perl %SRCDIR/libtest/test%TESTNUMBER.pl %CURL - + simple HTTPS GET with openssl engine - - + + --engine openssl -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test308 b/tests/data/test308 index 7534ed6ba0..39803d3b02 100644 --- a/tests/data/test308 +++ b/tests/data/test308 @@ -17,10 +17,10 @@ OpenSSL https - + simple HTTPS GET with invalid crypto engine - - + + --engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test309 b/tests/data/test309 index 0a3b529652..29b3e30619 100644 --- a/tests/data/test309 +++ b/tests/data/test309 @@ -55,10 +55,10 @@ SSL http https - + HTTP Location: redirect to HTTPS URL - - + + -k http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L diff --git a/tests/data/test31 b/tests/data/test31 index d661f64e13..3ceaad0f94 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -132,16 +132,16 @@ boo http - + HTTP with weirdly formatted cookies and cookiejar storage - + # Explicitly set the time zone to a known good one, in case the user is # using one of the 'right' zones that take into account leap seconds # which causes the cookie expiry times to be different. TZ=GMT - + http://test31.curl:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/jar%TESTNUMBER.txt --resolve test31.curl:%HTTPPORT:127.0.0.1 diff --git a/tests/data/test310 b/tests/data/test310 index 6b6f63a668..b9f1850ead 100644 --- a/tests/data/test310 +++ b/tests/data/test310 @@ -30,10 +30,10 @@ SSL https Server-localhost-sv.pem - + simple HTTPS GET - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test3102 b/tests/data/test3102 index 5d9bcf3854..4df7ba9c1f 100644 --- a/tests/data/test3102 +++ b/tests/data/test3102 @@ -30,10 +30,10 @@ https lib%TESTNUMBER - + verify certificate chain order with simple HTTPS GET - - + + https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test311 b/tests/data/test311 index 0e05b63c0f..a3f9ed0e27 100644 --- a/tests/data/test311 +++ b/tests/data/test311 @@ -21,10 +21,10 @@ SSL https Server-localhost0h-sv.pem - + HTTPS wrong subjectAltName but right CN - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test312 b/tests/data/test312 index f013a7cfd1..c8c46b8214 100644 --- a/tests/data/test312 +++ b/tests/data/test312 @@ -21,10 +21,10 @@ SSL https Server-localhost.nn-sv.pem - + HTTPS GET to localhost and null-prefixed CN cert - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test313 b/tests/data/test313 index d87a464919..12f91f9659 100644 --- a/tests/data/test313 +++ b/tests/data/test313 @@ -17,10 +17,10 @@ SSL https Server-localhost-sv.pem - + CRL test - - + + --cacert %SRCDIR/certs/EdelCurlRoot-ca.crt --crlfile %SRCDIR/certs/Server-localhost-sv.crl https://localhost:%HTTPSPORT/%TESTNUMBER # Ensure that we're running on localhost because we're checking the host name diff --git a/tests/data/test314 b/tests/data/test314 index cdc36af210..d8e596bd46 100644 --- a/tests/data/test314 +++ b/tests/data/test314 @@ -170,10 +170,10 @@ brotli http - + HTTP GET brotli compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test315 b/tests/data/test315 index 3073251e2b..fbadac63c9 100644 --- a/tests/data/test315 +++ b/tests/data/test315 @@ -60,10 +60,10 @@ brotli http - + HTTP GET brotli compressed content with broken header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test316 b/tests/data/test316 index be7de17be3..d2216ad06a 100644 --- a/tests/data/test316 +++ b/tests/data/test316 @@ -170,10 +170,10 @@ brotli http - + HTTP GET brotli compressed content of size more than CURL_MAX_WRITE_SIZE - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test317 b/tests/data/test317 index a8cfd6112e..10f0b88177 100644 --- a/tests/data/test317 +++ b/tests/data/test317 @@ -61,10 +61,10 @@ contents http - + HTTP with custom Authorization: and redirect to new host - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location diff --git a/tests/data/test318 b/tests/data/test318 index 94a53e8bcf..6577db5f92 100644 --- a/tests/data/test318 +++ b/tests/data/test318 @@ -61,10 +61,10 @@ contents http - + HTTP with custom Authorization: and redirect to new host - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Authorization: s3cr3t" --proxy-user testing:this --location-trusted diff --git a/tests/data/test319 b/tests/data/test319 index d2e35ea32b..81ef747191 100644 --- a/tests/data/test319 +++ b/tests/data/test319 @@ -34,9 +34,9 @@ libz http - + HTTP GET gzip transfer-encoded data in raw mode - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw diff --git a/tests/data/test32 b/tests/data/test32 index d5762f4e20..f613693041 100644 --- a/tests/data/test32 +++ b/tests/data/test32 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP with -d and -G - - + + -d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G diff --git a/tests/data/test320 b/tests/data/test320 index 77f684b04b..edf74bc585 100644 --- a/tests/data/test320 +++ b/tests/data/test320 @@ -46,9 +46,9 @@ httptls+srp TLS-SRP - + simple TLS-SRP HTTPS GET, check user in response - + --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc -A curl-test-suite https://%HOSTIP:%HTTPTLSPORT diff --git a/tests/data/test3200 b/tests/data/test3200 index a2f9074019..b2206fef39 100644 --- a/tests/data/test3200 +++ b/tests/data/test3200 @@ -15,9 +15,9 @@ none unittest - + curl_get_line unit tests - + %LOGDIR/curl_get_line%TESTNUMBER diff --git a/tests/data/test3202 b/tests/data/test3202 index 52d62b2b72..25ec6073b4 100644 --- a/tests/data/test3202 +++ b/tests/data/test3202 @@ -36,10 +36,10 @@ ipv6 http-ipv6 - + HTTP-IPv6 GET with PROXY protocol with spoofed client IP - - + + -g "http://%HOST6IP:%HTTP6PORT/%TESTNUMBER" --haproxy-clientip "2001:db8::" diff --git a/tests/data/test321 b/tests/data/test321 index c6b208b2a2..7d9395cc00 100644 --- a/tests/data/test321 +++ b/tests/data/test321 @@ -15,9 +15,9 @@ httptls+srp TLS-SRP - + TLS-SRP with bad username and password - + --insecure --tlsauthtype SRP --tlsuser baduser --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT diff --git a/tests/data/test322 b/tests/data/test322 index f7f82790fd..02cefba923 100644 --- a/tests/data/test322 +++ b/tests/data/test322 @@ -15,9 +15,9 @@ httptls+srp TLS-SRP - + TLS-SRP with bad password - + --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT diff --git a/tests/data/test323 b/tests/data/test323 index c46c02a389..72320a66e9 100644 --- a/tests/data/test323 +++ b/tests/data/test323 @@ -15,9 +15,9 @@ https TLS-SRP - + TLS-SRP to non-TLS-SRP server - + --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER diff --git a/tests/data/test324 b/tests/data/test324 index 159f36b845..aefd25e100 100644 --- a/tests/data/test324 +++ b/tests/data/test324 @@ -15,9 +15,9 @@ httptls+srp TLS-SRP - + TLS-SRP with server cert checking - + # no --insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/fails diff --git a/tests/data/test325 b/tests/data/test325 index 4bdf2aa316..0baed5c04a 100644 --- a/tests/data/test325 +++ b/tests/data/test325 @@ -38,10 +38,10 @@ SSL https - + HTTPS with attempted redirect to denied HTTP - - + + -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location diff --git a/tests/data/test326 b/tests/data/test326 index 56d4dcb359..f2f25ef34c 100644 --- a/tests/data/test326 +++ b/tests/data/test326 @@ -45,9 +45,9 @@ line 1 http - + HTTP GET chunked data in raw mode - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw diff --git a/tests/data/test327 b/tests/data/test327 index c4a3bc5119..6e86c3722b 100644 --- a/tests/data/test327 +++ b/tests/data/test327 @@ -39,10 +39,10 @@ Set-Cookie: foobar=name; expires=Thu, 01 Jan 1970 00:00:00 GMT; http - + HTTP with cookiejar without cookies left - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 diff --git a/tests/data/test328 b/tests/data/test328 index f17af3cc90..cb891b044f 100644 --- a/tests/data/test328 +++ b/tests/data/test328 @@ -31,10 +31,10 @@ http libz - + HTTP with "Content-Encoding: none - - + + http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed diff --git a/tests/data/test329 b/tests/data/test329 index 35892a8564..93135c5ec1 100644 --- a/tests/data/test329 +++ b/tests/data/test329 @@ -40,16 +40,16 @@ moo http - + HTTP cookie with Max-Age=0 - + # Explicitly set the time zone to a known good one, in case the user is # using one of the 'right' zones that take into account leap seconds # which causes the cookie expiry times to be different. TZ=GMT - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b %LOGDIR/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 diff --git a/tests/data/test33 b/tests/data/test33 index bd02e00885..34afff35b7 100644 --- a/tests/data/test33 +++ b/tests/data/test33 @@ -20,9 +20,9 @@ HTTP/1.1 200 OK swsclose http - + HTTP PUT with resume - + 012345678 012345678 @@ -35,7 +35,7 @@ HTTP PUT with resume 012345678 012345678 - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C 50 diff --git a/tests/data/test330 b/tests/data/test330 index d145fc07ac..4344e2d4b2 100644 --- a/tests/data/test330 +++ b/tests/data/test330 @@ -60,10 +60,10 @@ contents http - + HTTP with custom Cookie: and redirect to new host - - + + http://first.host.it.is/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT -H "Cookie: test=yes" --location diff --git a/tests/data/test331 b/tests/data/test331 index 34d9a78a68..8ab268203f 100644 --- a/tests/data/test331 +++ b/tests/data/test331 @@ -36,10 +36,10 @@ Funny-head: yesyes swsclose http - + HTTP with cookie using host name 'moo' - - + + -x http://%HOSTIP:%HTTPPORT http://moo/we/want/%TESTNUMBER -b none http://moo/we/want/%TESTNUMBER0002 diff --git a/tests/data/test332 b/tests/data/test332 index 54763eda0e..e00f772311 100644 --- a/tests/data/test332 +++ b/tests/data/test332 @@ -22,10 +22,10 @@ returned tftp - + TFTP retrieve with blksize 400 - - + + tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400 diff --git a/tests/data/test333 b/tests/data/test333 index e0fc450d54..8f048e6cbe 100644 --- a/tests/data/test333 +++ b/tests/data/test333 @@ -16,10 +16,10 @@ command-line none - + Try a non-boolean command line option with --no- - - + + --no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER diff --git a/tests/data/test335 b/tests/data/test335 index 558d2ca77d..a376f4018d 100644 --- a/tests/data/test335 +++ b/tests/data/test335 @@ -63,10 +63,10 @@ http crypto proxy - + HTTP with proxy Digest and site Digest with creds in URLs - - + + http://digest:alot@data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest diff --git a/tests/data/test336 b/tests/data/test336 index 89e9bffc0d..f50b42adb3 100644 --- a/tests/data/test336 +++ b/tests/data/test336 @@ -31,10 +31,10 @@ REPLY SIZE 500 no such command ftp - + FTP range download when SIZE doesn't work - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 diff --git a/tests/data/test337 b/tests/data/test337 index f8ca6856e8..d44a712fbb 100644 --- a/tests/data/test337 +++ b/tests/data/test337 @@ -31,10 +31,10 @@ REPLY SIZE 213 file: 213, Size =51 ftp - + FTP range download with SIZE returning extra crap - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 diff --git a/tests/data/test338 b/tests/data/test338 index 4de5970420..d3acd5f098 100644 --- a/tests/data/test338 +++ b/tests/data/test338 @@ -34,10 +34,10 @@ connection-monitor http - + ANYAUTH connection reuse of non-authed connection - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u foo:moo diff --git a/tests/data/test34 b/tests/data/test34 index 3119ce22a3..5d81a5a8f7 100644 --- a/tests/data/test34 +++ b/tests/data/test34 @@ -41,10 +41,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb http - + HTTP GET with chunked Transfer-Encoding - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test340 b/tests/data/test340 index 6c15dc190f..c003e42afa 100644 --- a/tests/data/test340 +++ b/tests/data/test340 @@ -18,10 +18,10 @@ singlecwd ftp - + FTP using %00 in path with singlecwd - - + + --ftp-method singlecwd ftp://%HOSTIP:%FTPPORT/%00first/second/third/%TESTNUMBER diff --git a/tests/data/test348 b/tests/data/test348 index c9aa2cec49..55e9d608dd 100644 --- a/tests/data/test348 +++ b/tests/data/test348 @@ -18,9 +18,9 @@ STOR 552 disk full ftp - + FTP upload file with 552 disk full response - + data to @@ -29,7 +29,7 @@ that FTP works so does it? - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test349 b/tests/data/test349 index 7abd057975..c1106f2ac3 100644 --- a/tests/data/test349 +++ b/tests/data/test349 @@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it. http - + HTTP GET --fail-with-body on HTTP error return - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body diff --git a/tests/data/test35 b/tests/data/test35 index 33e6eac73f..a098769aab 100644 Binary files a/tests/data/test35 and b/tests/data/test35 differ diff --git a/tests/data/test350 b/tests/data/test350 index 6cb53fa11f..6830d704d0 100644 --- a/tests/data/test350 +++ b/tests/data/test350 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP root dir list multicwd - - + + ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd diff --git a/tests/data/test351 b/tests/data/test351 index 219677f781..ef21364ad4 100644 --- a/tests/data/test351 +++ b/tests/data/test351 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP root dir list nocwd - - + + ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd diff --git a/tests/data/test352 b/tests/data/test352 index 5f498a23b7..cfcdc1f10d 100644 --- a/tests/data/test352 +++ b/tests/data/test352 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP root dir list singlecwd - - + + ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd diff --git a/tests/data/test353 b/tests/data/test353 index 1adee379bd..26115d6753 100644 --- a/tests/data/test353 +++ b/tests/data/test353 @@ -32,10 +32,10 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr ftp - + FTP home dir list singlecwd - - + + ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd diff --git a/tests/data/test354 b/tests/data/test354 index cdd8270518..dc6d732d8b 100644 --- a/tests/data/test354 +++ b/tests/data/test354 @@ -26,10 +26,10 @@ REPLY USER 200 fine, proceed without password ftp - + FTP without password - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test355 b/tests/data/test355 index 8b32c92e78..67f7777ff5 100644 --- a/tests/data/test355 +++ b/tests/data/test355 @@ -30,10 +30,10 @@ alt-svc http - + load Alt-Svc from file and use - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "" diff --git a/tests/data/test356 b/tests/data/test356 index 2597f15e88..3fb001c58f 100644 --- a/tests/data/test356 +++ b/tests/data/test356 @@ -35,14 +35,14 @@ alt-svc http - + parse incoming Alt-Svc and save to file - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" diff --git a/tests/data/test357 b/tests/data/test357 index 5d1f456a3b..fcd4b96446 100644 --- a/tests/data/test357 +++ b/tests/data/test357 @@ -47,10 +47,10 @@ no-expect http - + HTTP PUT with Expect: 100-continue and 417 response - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --expect100-timeout 999 # 1053700 x 'x', large enough to invoke the 100-continue behaviour diff --git a/tests/data/test358 b/tests/data/test358 index 47afc582cb..5df596de0c 100644 --- a/tests/data/test358 +++ b/tests/data/test358 @@ -36,14 +36,14 @@ h2c http http/2 - + HTTPS GET translated by alt-svc lookup to HTTP/2 GET - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + --http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" diff --git a/tests/data/test359 b/tests/data/test359 index 9b466b7732..117b4defe3 100644 --- a/tests/data/test359 +++ b/tests/data/test359 @@ -36,14 +36,14 @@ h2c https http/2 - + HTTPS GET translated by alt-svc lookup to HTTP/2 GET - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + --http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" diff --git a/tests/data/test36 b/tests/data/test36 index fb4c885eb2..1f055726bc 100644 --- a/tests/data/test36 +++ b/tests/data/test36 @@ -38,10 +38,10 @@ a http - + HTTP GET with bad chunked Transfer-Encoding - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test360 b/tests/data/test360 index e67c847ed5..b7d570d7b6 100644 --- a/tests/data/test360 +++ b/tests/data/test360 @@ -11,10 +11,10 @@ http - + Error on both --fail-with-body and --fail - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body --fail diff --git a/tests/data/test361 b/tests/data/test361 index ec135866a9..4fbf3d5ea2 100644 --- a/tests/data/test361 +++ b/tests/data/test361 @@ -21,10 +21,10 @@ This silly page doesn't reaaaaaly exist so you should not get it. http - + HTTP GET --fail-with-body on HTTP error return - twice - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body diff --git a/tests/data/test362 b/tests/data/test362 index 9007619310..e8ce9731ed 100644 --- a/tests/data/test362 +++ b/tests/data/test362 @@ -12,9 +12,9 @@ STOR ftp - + FTP resume upload file with nothing to start from - + data to @@ -23,7 +23,7 @@ that FTP works so does it? - + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at - diff --git a/tests/data/test363 b/tests/data/test363 index 24179171a6..7cc7dad991 100644 --- a/tests/data/test363 +++ b/tests/data/test363 @@ -50,16 +50,16 @@ proxy http http-proxy - + CONNECT with short sends - + # make the first send cut off after this amount of data CURL_SMALLREQSEND=8 # make repeated sends small too CURL_SMALLSENDS=8 - + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes" diff --git a/tests/data/test364 b/tests/data/test364 index 627bc3170b..0e2ccd1514 100644 --- a/tests/data/test364 +++ b/tests/data/test364 @@ -24,10 +24,10 @@ SSL https - + HTTPS PUT of small file - - + + -k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test365 b/tests/data/test365 index add760f6c7..05ab8faa36 100644 --- a/tests/data/test365 +++ b/tests/data/test365 @@ -43,10 +43,10 @@ chunked data fun http - + HTTP/1.1 with chunked AND Content-Length headers - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test366 b/tests/data/test366 index 46a4b502a8..d2193ff14a 100644 --- a/tests/data/test366 +++ b/tests/data/test366 @@ -26,10 +26,10 @@ server not available http - + HTTP --retry-max-time with too long Retry-After - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 2 --retry-max-time 10 diff --git a/tests/data/test368 b/tests/data/test368 index 505ce34ea9..69b63e94f6 100644 --- a/tests/data/test368 +++ b/tests/data/test368 @@ -26,10 +26,10 @@ Connection: close http - + Append dash if -r range specified without one - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4 diff --git a/tests/data/test37 b/tests/data/test37 index f879859629..d5e79824c6 100644 --- a/tests/data/test37 +++ b/tests/data/test37 @@ -19,10 +19,10 @@ FAILURE http - + HTTP GET with nothing returned from server - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test371 b/tests/data/test371 index 83ea5c73ba..b58237f359 100644 --- a/tests/data/test371 +++ b/tests/data/test371 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + using more -o than URLs in the command line - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progress-meter diff --git a/tests/data/test376 b/tests/data/test376 index 8d15ec0928..991077caf7 100644 --- a/tests/data/test376 +++ b/tests/data/test376 @@ -31,9 +31,9 @@ Funny-head: yesyes http - + --remove-on-error - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-error diff --git a/tests/data/test378 b/tests/data/test378 index ca908b7aa0..ef77225be2 100644 --- a/tests/data/test378 +++ b/tests/data/test378 @@ -17,10 +17,10 @@ HTTP POST none - + Reject using -T and -d at once - - + + -T %LOGDIR/%TESTNUMBER -d input http://never-accessed diff --git a/tests/data/test379 b/tests/data/test379 index 491d815c08..964cbdf055 100644 --- a/tests/data/test379 +++ b/tests/data/test379 @@ -34,9 +34,9 @@ exists before command runs http - + --remove-on-error with --no-clobber and an added number - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clobber diff --git a/tests/data/test38 b/tests/data/test38 index da352d75d6..abd2d3e362 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -24,9 +24,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-) http - + HTTP resume request without server supporting it - + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt diff --git a/tests/data/test383 b/tests/data/test383 index 6ba8f5e2db..bb8cb666d1 100644 --- a/tests/data/test383 +++ b/tests/data/test383 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP with --json - - + + --json '{ "drink": "coffe" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test384 b/tests/data/test384 index 9651f9f956..6148ef40d4 100644 --- a/tests/data/test384 +++ b/tests/data/test384 @@ -31,9 +31,9 @@ Funny-head: yesyes http - + HTTP with --json from stdin - + { "drink": "coffe" } diff --git a/tests/data/test385 b/tests/data/test385 index ee543fa64f..b2e3c4d8c0 100644 --- a/tests/data/test385 +++ b/tests/data/test385 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP with --json x 2 - - + + --json '{ "drink": "coffe",' --json ' "crunch": "cookie" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Content-Type: drinks/hot" diff --git a/tests/data/test386 b/tests/data/test386 index 5e2fd6adfe..ed20f5e453 100644 --- a/tests/data/test386 +++ b/tests/data/test386 @@ -45,10 +45,10 @@ hello http - + HTTP with --json + --next - - + + --json '{ "drink": "coffe" }' http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test388 b/tests/data/test388 index 3a0214a0b7..300c88f754 100644 --- a/tests/data/test388 +++ b/tests/data/test388 @@ -77,10 +77,10 @@ http !SSPI crypto - + HTTP with Digest and multiple qop values with leading space - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 diff --git a/tests/data/test389 b/tests/data/test389 index f805bc2770..fcb29f5b8c 100644 --- a/tests/data/test389 +++ b/tests/data/test389 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + *.localhost is a local host - - + + http://curlmachine.localhost:%HTTPPORT/%TESTNUMBER # Ensure that we're running on localhost diff --git a/tests/data/test39 b/tests/data/test39 index 36fafd7fad..1829617499 100644 --- a/tests/data/test39 +++ b/tests/data/test39 @@ -25,10 +25,10 @@ Mime http - + HTTP RFC1867-type formposting with filename= and type= - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2= # We create this file before the command is invoked! diff --git a/tests/data/test391 b/tests/data/test391 index 1eff2ef3eb..24428a08f0 100644 --- a/tests/data/test391 +++ b/tests/data/test391 @@ -45,10 +45,10 @@ Content-Type: text/html http - + --path-as-is with redirect, keeping dotdots - - + + http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L diff --git a/tests/data/test392 b/tests/data/test392 index 71d4486e22..5c1076c82b 100644 --- a/tests/data/test392 +++ b/tests/data/test392 @@ -27,14 +27,14 @@ boo http - + HTTP secure cookies over localhost - + TZ=GMT - + http://localhost:%HTTPPORT/%TESTNUMBER -b none http://localhost:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test393 b/tests/data/test393 index 797b4f1eb6..0cbbf2d2dc 100644 --- a/tests/data/test393 +++ b/tests/data/test393 @@ -37,10 +37,10 @@ Funny-head: yesyes http - + HTTP max-filesize and out-of-range Content-Length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000 diff --git a/tests/data/test394 b/tests/data/test394 index 9d2779d897..2154297d2f 100644 --- a/tests/data/test394 +++ b/tests/data/test394 @@ -32,10 +32,10 @@ Funny-head: yesyes http - + HTTP with rubbish in Content-Length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test395 b/tests/data/test395 index 541b66b508..9bdb2e24a6 100644 --- a/tests/data/test395 +++ b/tests/data/test395 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + HTTP and out-of-range Content-Length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test396 b/tests/data/test396 index 11dd1a901e..4454184ea1 100644 --- a/tests/data/test396 +++ b/tests/data/test396 @@ -174,10 +174,10 @@ zstd http - + HTTP GET zstd compressed content - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test397 b/tests/data/test397 index 4ad130a76b..956bb83e6d 100644 --- a/tests/data/test397 +++ b/tests/data/test397 @@ -170,10 +170,10 @@ zstd http - + HTTP GET zstd compressed content of size more than CURL_MAX_WRITE_SIZE - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed diff --git a/tests/data/test398 b/tests/data/test398 index b949064d29..227478b5b5 100644 --- a/tests/data/test398 +++ b/tests/data/test398 @@ -35,10 +35,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT http - + Reject HTTP/1.1 response with colon-less header - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test4 b/tests/data/test4 index c0b4f05d33..58e1650b07 100644 --- a/tests/data/test4 +++ b/tests/data/test4 @@ -26,10 +26,10 @@ Funny-head: yesyes http - + Replaced internal and added custom HTTP headers - - + + -H "extra-header: here" -H "Accept: replaced" -H "X-Custom-Header;" -H "X-Test: foo; " -H "X-Test:" -H "X-Test2: foo;" -H "X-Test3: " -H "X-Test4; " -H "X-Test5;ignored" http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test40 b/tests/data/test40 index ad437d07de..3f56956583 100644 --- a/tests/data/test40 +++ b/tests/data/test40 @@ -49,10 +49,10 @@ body http - + HTTP redirect with whitespace after ? (and conversion) - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test400 b/tests/data/test400 index f2d3263821..db774bf120 100644 --- a/tests/data/test400 +++ b/tests/data/test400 @@ -36,10 +36,10 @@ SSL ftps - + FTPS dir list PASV unencrypted data - - + + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/ diff --git a/tests/data/test401 b/tests/data/test401 index 043b660e68..5124447d84 100644 --- a/tests/data/test401 +++ b/tests/data/test401 @@ -16,9 +16,9 @@ SSL ftps - + FTPS PASV upload file - + data to @@ -27,7 +27,7 @@ that FTPS works so does it? - + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test402 b/tests/data/test402 index 5c7bc678e2..86283749a4 100644 --- a/tests/data/test402 +++ b/tests/data/test402 @@ -15,10 +15,10 @@ SSL ftp - + FTP SSL required on non-SSL server - - + + -k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test403 b/tests/data/test403 index 7e4d2bff50..7c2904afbe 100644 --- a/tests/data/test403 +++ b/tests/data/test403 @@ -38,10 +38,10 @@ SSL ftps - + FTPS with CCC not supported by server - - + + -k --ftp-ssl-control --ftp-ssl-ccc ftps://%HOSTIP:%FTPSPORT/ diff --git a/tests/data/test404 b/tests/data/test404 index 0f73325ebe..8461abfc00 100644 --- a/tests/data/test404 +++ b/tests/data/test404 @@ -15,10 +15,10 @@ SSL ftps - + FTPS with invalid cacert - - + + --ftp-ssl-control --cacert moooo ftps://%HOSTIP:%FTPSPORT/ diff --git a/tests/data/test405 b/tests/data/test405 index fc291d1ab8..90369b8ade 100644 --- a/tests/data/test405 +++ b/tests/data/test405 @@ -15,10 +15,10 @@ SSL ftp - + FTPS operation to FTP port - - + + -m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER diff --git a/tests/data/test406 b/tests/data/test406 index 01d83dc95b..eca49d0d37 100644 --- a/tests/data/test406 +++ b/tests/data/test406 @@ -36,10 +36,10 @@ SSL ftps - + FTPS dir list, PORT with specified IP - - + + -k --ftp-ssl-control -P %CLIENTIP ftps://%HOSTIP:%FTPSPORT/ diff --git a/tests/data/test407 b/tests/data/test407 index 4f2591e981..8b35a9f2b3 100644 --- a/tests/data/test407 +++ b/tests/data/test407 @@ -25,10 +25,10 @@ SSL ftps - + Get two FTPS files from the same remote dir: no second CWD - - + + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER diff --git a/tests/data/test408 b/tests/data/test408 index 676ec9d81b..594eb01aa7 100644 --- a/tests/data/test408 +++ b/tests/data/test408 @@ -21,10 +21,10 @@ SSL ftps - + FTPS PORT upload with CWD - - + + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P - diff --git a/tests/data/test409 b/tests/data/test409 index 4160a11ab7..a1f9029332 100644 --- a/tests/data/test409 +++ b/tests/data/test409 @@ -16,9 +16,9 @@ SSL ftps - + FTPS PASV upload file - + data to @@ -27,7 +27,7 @@ that FTP works so does it? - + -k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test41 b/tests/data/test41 index 7a133307d1..4e5fa84ad9 100644 --- a/tests/data/test41 +++ b/tests/data/test41 @@ -18,10 +18,10 @@ Mime http - + HTTP formpost with missing file - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F moo=@boo diff --git a/tests/data/test410 b/tests/data/test410 index 4fec0b731d..79d12def68 100644 --- a/tests/data/test410 +++ b/tests/data/test410 @@ -28,14 +28,14 @@ SSL https - + HTTPS GET with very long request header - + # 14 characters repeated 3500 times makes 49000 bytes Long: %repeat[3500 x header content]% - + -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER diff --git a/tests/data/test411 b/tests/data/test411 index eb6fad1bc6..cdfdd46b41 100644 --- a/tests/data/test411 +++ b/tests/data/test411 @@ -16,10 +16,10 @@ none - + -K with missing file causes error - - + + -K %LOGDIR/missing http://localhost diff --git a/tests/data/test412 b/tests/data/test412 index 3f740f1689..de607baa22 100644 --- a/tests/data/test412 +++ b/tests/data/test412 @@ -33,14 +33,14 @@ debug http - + alt-svc using host name with trailing dot in URL - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER" diff --git a/tests/data/test413 b/tests/data/test413 index cfb7a72976..8639306e0c 100644 --- a/tests/data/test413 +++ b/tests/data/test413 @@ -33,14 +33,14 @@ debug http - + alt-svc using host name with trailing dot on host from file - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER" diff --git a/tests/data/test415 b/tests/data/test415 index 099ec830bf..08d60482d2 100644 --- a/tests/data/test415 +++ b/tests/data/test415 @@ -33,10 +33,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT http - + HTTP response with control code then negative Content-Length - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test416 b/tests/data/test416 index 93dc067f2c..b6b10b3df2 100644 --- a/tests/data/test416 +++ b/tests/data/test416 @@ -28,10 +28,10 @@ RETRSIZE 7 ftp - + FTP growing file support - - + + --ignore-content-length ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test419 b/tests/data/test419 index 35e12597fe..f8ec82522b 100644 --- a/tests/data/test419 +++ b/tests/data/test419 @@ -17,10 +17,10 @@ failure http - + --dump-header to file that cannot be created - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D loggg/save-here/fails diff --git a/tests/data/test42 b/tests/data/test42 index 835f18185e..50e5018066 100644 --- a/tests/data/test42 +++ b/tests/data/test42 @@ -49,10 +49,10 @@ body http - + HTTP redirect with whitespace in path (and conversion) - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test420 b/tests/data/test420 index 7b7ecb437e..c635264da7 100644 --- a/tests/data/test420 +++ b/tests/data/test420 @@ -33,10 +33,10 @@ Set-Cookie: mycookie1=; Path=/; Max-Age=-1; Expires=Thu, 01 Jan 1970 00:00:00 GM http - + Setting cookies set with expired dates that were loaded from jar - - + + http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b %LOGDIR/cookie%TESTNUMBER -c %LOGDIR/save%TESTNUMBER diff --git a/tests/data/test425 b/tests/data/test425 index dff6ab4a8f..399ca1983f 100644 --- a/tests/data/test425 +++ b/tests/data/test425 @@ -26,10 +26,10 @@ Content-Type: text/html http - + HTTP PUT with path ending with slash + query - - + + -T %LOGDIR/up%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER/?fullpath diff --git a/tests/data/test43 b/tests/data/test43 index 4e7408be13..1c36f1c60c 100644 --- a/tests/data/test43 +++ b/tests/data/test43 @@ -50,10 +50,10 @@ If this is received, the location following worked http - + HTTP Location: following over HTTP proxy - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test430 b/tests/data/test430 index 3826f1556f..377c2d48b9 100644 --- a/tests/data/test430 +++ b/tests/data/test430 @@ -59,10 +59,10 @@ data = "c" http - + Three -K uses with --next and --data in each - - + + -K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b -K %LOGDIR/config%TESTNUMBER-c diff --git a/tests/data/test431 b/tests/data/test431 index 52c39d1bad..9622d64e1d 100644 --- a/tests/data/test431 +++ b/tests/data/test431 @@ -53,10 +53,10 @@ data = "b" http - + Two -K uses with --next and then one on cmdline - - + + -K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c" diff --git a/tests/data/test432 b/tests/data/test432 index fd056c3680..02a46111d3 100644 --- a/tests/data/test432 +++ b/tests/data/test432 @@ -58,10 +58,10 @@ data = "c" http - + Use -K with --next and --config from within - - + + -K %LOGDIR/config%TESTNUMBER diff --git a/tests/data/test437 b/tests/data/test437 index a49fb8c48b..f12052d241 100644 --- a/tests/data/test437 +++ b/tests/data/test437 @@ -32,14 +32,14 @@ alt-svc http - + Alt-Svc to numerical IPv6 address - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" diff --git a/tests/data/test438 b/tests/data/test438 index 9015e927e8..4dd3b82c80 100644 --- a/tests/data/test438 +++ b/tests/data/test438 @@ -36,14 +36,14 @@ ipv6 http http-ipv6 - + HTTPS IPv4 GET translated by alt-svc to IPv6 address - + # make debug-curl accept Alt-Svc over plain HTTP CURL_ALTSVC_HTTP="yeah" - + --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" diff --git a/tests/data/test44 b/tests/data/test44 index ed6ea23010..bc103e031b 100644 --- a/tests/data/test44 +++ b/tests/data/test44 @@ -26,10 +26,10 @@ Mime http - + HTTP RFC1867-type formposting without Expect: header - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" # We create this file before the command is invoked! diff --git a/tests/data/test445 b/tests/data/test445 index 0406c0f9ac..dbdcfe6ba4 100644 --- a/tests/data/test445 +++ b/tests/data/test445 @@ -42,10 +42,10 @@ smtp http-proxy - + Refuse tunneling protocols through HTTP proxy - - + + -x http://%HOSTIP:%PROXYPORT/%TESTNUMBER -p gopher://127.0.0.1 dict://127.0.0.1 http://moo https://example telnet://another ftp://yes ftps://again imap://more ldap://perhaps mqtt://yes pop3://mail rtsp://harder scp://copy sftp://files smb://wird smtp://send diff --git a/tests/data/test45 b/tests/data/test45 index 0368882d67..e7c3b65926 100644 --- a/tests/data/test45 +++ b/tests/data/test45 @@ -49,10 +49,10 @@ If this is received, the location following worked http - + simple HTTP Location: without protocol in initial URL - - + + %HOSTIP:%HTTPPORT/want/%TESTNUMBER -L diff --git a/tests/data/test46 b/tests/data/test46 index 9f9e881cbd..042af7e6e6 100644 --- a/tests/data/test46 +++ b/tests/data/test46 @@ -37,16 +37,16 @@ This server reply is for testing cookies http - + HTTP with bad domain name, get cookies and store in cookie jar - + # Explicitly set the time zone to a known good one, in case the user is # using one of the 'right' zones that take into account leap seconds # which causes the cookie expiry times to be different from what we expect. TZ=GMT - + domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c %LOGDIR/jar%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER diff --git a/tests/data/test47 b/tests/data/test47 index e506b346bf..42086999b4 100644 --- a/tests/data/test47 +++ b/tests/data/test47 @@ -24,10 +24,10 @@ Server: test-server/fake http - + simple HTTP 1.0 GET - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0 diff --git a/tests/data/test48 b/tests/data/test48 index c983768341..24fa0abbb3 100644 --- a/tests/data/test48 +++ b/tests/data/test48 @@ -25,10 +25,10 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT http - + HTTP with -d and -G and -I - - + + -d "foo=moo&moo=poo" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -G -I http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test49 b/tests/data/test49 index 79890d68b4..996cf018bd 100644 --- a/tests/data/test49 +++ b/tests/data/test49 @@ -45,10 +45,10 @@ body http - + HTTP follow redirect with ../ - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test490 b/tests/data/test490 index e94ea0d2a1..a0bc8f3539 100644 --- a/tests/data/test490 +++ b/tests/data/test490 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + Two globbed HTTP PUTs - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/in%TESTNUMBER}' diff --git a/tests/data/test491 b/tests/data/test491 index a3c93aa50c..15bb756b55 100644 --- a/tests/data/test491 +++ b/tests/data/test491 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + Two globbed HTTP PUTs, the second upload file is missing - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/bad%TESTNUMBER}' diff --git a/tests/data/test492 b/tests/data/test492 index dcf18eb694..d576cca1cf 100644 --- a/tests/data/test492 +++ b/tests/data/test492 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + Two globbed HTTP PUTs to two globbed URLs - - + + 'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{%LOGDIR/first%TESTNUMBER,%LOGDIR/second%TESTNUMBER}' -H "Testno: %TESTNUMBER" diff --git a/tests/data/test494 b/tests/data/test494 index 78faab6a1d..648318729d 100644 --- a/tests/data/test494 +++ b/tests/data/test494 @@ -21,10 +21,10 @@ blipp ftp - + skip 'macdef' when parsing netrc - - + + --netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test496 b/tests/data/test496 index 19050f3772..aa729c66ad 100644 --- a/tests/data/test496 +++ b/tests/data/test496 @@ -21,7 +21,7 @@ none parallel upload missing file - + 0 -Z -Tz diff --git a/tests/data/test5 b/tests/data/test5 index 4e8cd46eef..8d4078fb77 100644 --- a/tests/data/test5 +++ b/tests/data/test5 @@ -25,10 +25,10 @@ Funny-head: yesyes http - + HTTP over proxy - - + + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER#5 -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test50 b/tests/data/test50 index 308095e38c..ce4fd16601 100644 --- a/tests/data/test50 +++ b/tests/data/test50 @@ -45,10 +45,10 @@ body http - + HTTP follow redirect with ../../ - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test500 b/tests/data/test500 index 384de1b5de..c215318bc5 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -34,10 +34,10 @@ http lib500 - + simple libcurl HTTP GET tool - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test501 b/tests/data/test501 index b86642f6a3..fb115cba64 100644 --- a/tests/data/test501 +++ b/tests/data/test501 @@ -22,10 +22,10 @@ http lib%TESTNUMBER - + simple libcurl attempt operation without URL set - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER diff --git a/tests/data/test502 b/tests/data/test502 index 4a6d60f132..0bca19c623 100644 --- a/tests/data/test502 +++ b/tests/data/test502 @@ -26,10 +26,10 @@ file lib%TESTNUMBER - + simple multi file:// get - - + + file://%PWD/%LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test503 b/tests/data/test503 index d8e04aa650..0690ad3407 100644 --- a/tests/data/test503 +++ b/tests/data/test503 @@ -53,10 +53,10 @@ lib%TESTNUMBER proxy - + simple multi http:// through proxytunnel with authentication info - - + + http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT diff --git a/tests/data/test504 b/tests/data/test504 index 05061e2a89..917c4aee16 100644 --- a/tests/data/test504 +++ b/tests/data/test504 @@ -28,10 +28,10 @@ proxy lib%TESTNUMBER - + simple multi through local proxy without listener - - + + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test505 b/tests/data/test505 index 03437063f9..6eba48936f 100644 --- a/tests/data/test505 +++ b/tests/data/test505 @@ -19,10 +19,10 @@ ftp lib%TESTNUMBER - + FTP upload with rename after transfer - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test508 b/tests/data/test508 index 143fe31716..06cdba75f5 100644 --- a/tests/data/test508 +++ b/tests/data/test508 @@ -30,10 +30,10 @@ http lib%TESTNUMBER - + send HTTP POST using read callback - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test51 b/tests/data/test51 index 9bb28654c0..277da000fb 100644 --- a/tests/data/test51 +++ b/tests/data/test51 @@ -45,10 +45,10 @@ body http - + HTTP follow redirect with excessive ../ - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test510 b/tests/data/test510 index b673fa11b7..36d6c1f137 100644 --- a/tests/data/test510 +++ b/tests/data/test510 @@ -31,10 +31,10 @@ http lib%TESTNUMBER - + send HTTP POST using read callback, using chunked transfer-encoding - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test511 b/tests/data/test511 index 6bcf25de59..adcabe8bda 100644 --- a/tests/data/test511 +++ b/tests/data/test511 @@ -24,10 +24,10 @@ ftp lib%TESTNUMBER - + FTP with FILETIME and NOBODY but missing file - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test512 b/tests/data/test512 index 6598d3162d..8935a12c77 100644 --- a/tests/data/test512 +++ b/tests/data/test512 @@ -29,10 +29,10 @@ http lib%TESTNUMBER - + simple curl_easy_duplicate() test - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test513 b/tests/data/test513 index df0a96260a..ae413bbc93 100644 --- a/tests/data/test513 +++ b/tests/data/test513 @@ -21,9 +21,9 @@ http lib%TESTNUMBER - + send HTTP POST using read callback that returns CURL_READFUNC_ABORT - + # the 1s post-command delay helps to prevent a spurious failure on s390 http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test514 b/tests/data/test514 index 1d5f380500..fcf1a07ca3 100644 --- a/tests/data/test514 +++ b/tests/data/test514 @@ -32,9 +32,9 @@ http lib%TESTNUMBER - + First set options to POST and then to make HEAD - + # the 1s post-command delay helps to prevent a spurious failure on s390 http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test515 b/tests/data/test515 index 42d153b03f..9bf6131edd 100644 --- a/tests/data/test515 +++ b/tests/data/test515 @@ -28,10 +28,10 @@ http lib%TESTNUMBER - + make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test516 b/tests/data/test516 index 0878cceb93..e8b522c32d 100644 --- a/tests/data/test516 +++ b/tests/data/test516 @@ -33,10 +33,10 @@ http lib%TESTNUMBER - + make an HTTPPOST set to NULL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test517 b/tests/data/test517 index 0152c0f29d..bd197cb5bc 100644 --- a/tests/data/test517 +++ b/tests/data/test517 @@ -20,10 +20,10 @@ none lib%TESTNUMBER - + curl_getdate() testing - - + + nothing diff --git a/tests/data/test518 b/tests/data/test518 index 042b6d767d..05a809bf32 100644 --- a/tests/data/test518 +++ b/tests/data/test518 @@ -43,10 +43,10 @@ lib%TESTNUMBER ./libtest/lib%TESTNUMBER check - + HTTP GET with more than FD_SETSIZE descriptors open - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test519 b/tests/data/test519 index 9b47ed28c5..08e56a2ea6 100644 --- a/tests/data/test519 +++ b/tests/data/test519 @@ -51,10 +51,10 @@ http lib%TESTNUMBER - + GET same URL twice with different users - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test52 b/tests/data/test52 index 662a4ef331..e636ed959c 100644 --- a/tests/data/test52 +++ b/tests/data/test52 @@ -45,10 +45,10 @@ body http - + HTTP follow redirect with ./-prefix - - + + http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L diff --git a/tests/data/test520 b/tests/data/test520 index 755caebebc..6a27bb3f8e 100644 --- a/tests/data/test520 +++ b/tests/data/test520 @@ -26,10 +26,10 @@ ftp lib520 - + FTP RETR with FILETIME - - + + ftp://%HOSTIP:%FTPPORT/520 diff --git a/tests/data/test521 b/tests/data/test521 index b8b7896a54..1eec1bb2cf 100644 --- a/tests/data/test521 +++ b/tests/data/test521 @@ -35,10 +35,10 @@ ftp lib%TESTNUMBER - + FTP dir list PASV with CURLOPT_PORT - - + + ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT diff --git a/tests/data/test522 b/tests/data/test522 index 6691a29a15..3aa053a584 100644 --- a/tests/data/test522 +++ b/tests/data/test522 @@ -32,10 +32,10 @@ http lib521 - + HTTP GET with CURLOPT_PORT - - + + http://%HOSTIP/%TESTNUMBER %HTTPPORT diff --git a/tests/data/test523 b/tests/data/test523 index 88cda7a2cd..2bd5a98198 100644 --- a/tests/data/test523 +++ b/tests/data/test523 @@ -34,11 +34,11 @@ http lib%TESTNUMBER - + HTTP GET with proxy and CURLOPT_PORT - + # first URL then proxy - + http://www.example.com:999/%TESTNUMBER http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test524 b/tests/data/test524 index 13246e235d..3b383003fb 100644 --- a/tests/data/test524 +++ b/tests/data/test524 @@ -20,11 +20,11 @@ ftp lib%TESTNUMBER - + FTP upload with target URL ending with slash - + # first URL then proxy - + ftp://%HOSTIP:%FTPPORT/path/to/ diff --git a/tests/data/test525 b/tests/data/test525 index 43e5728e97..2b96a7fd96 100644 --- a/tests/data/test525 +++ b/tests/data/test525 @@ -22,10 +22,10 @@ ftp lib%TESTNUMBER - + FTP PORT upload using multi interface - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test526 b/tests/data/test526 index be2e4be802..85b24d5db9 100644 --- a/tests/data/test526 +++ b/tests/data/test526 @@ -29,10 +29,10 @@ ftp lib%TESTNUMBER - + FTP RETR same file using different handles but same connection - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test527 b/tests/data/test527 index be2e4be802..85b24d5db9 100644 --- a/tests/data/test527 +++ b/tests/data/test527 @@ -29,10 +29,10 @@ ftp lib%TESTNUMBER - + FTP RETR same file using different handles but same connection - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test528 b/tests/data/test528 index a55768b336..7cb9e8b114 100644 --- a/tests/data/test528 +++ b/tests/data/test528 @@ -33,10 +33,10 @@ http lib526 - + HTTP GET same file using different handles but same connection - - + + http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER diff --git a/tests/data/test529 b/tests/data/test529 index 9c2bc501b5..737e5018f9 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -22,10 +22,10 @@ ftp lib%TESTNUMBER - + FTP PORT upload using multi interface (weird cleanup function sequence) - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test53 b/tests/data/test53 index 86dfe9af4f..0bbc5d6373 100644 --- a/tests/data/test53 +++ b/tests/data/test53 @@ -25,10 +25,10 @@ This server says moo http - + HTTP, junk session cookies - - + + %HOSTIP:%HTTPPORT/want/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -j diff --git a/tests/data/test531 b/tests/data/test531 index 3463613ac8..59501d5ead 100644 --- a/tests/data/test531 +++ b/tests/data/test531 @@ -25,10 +25,10 @@ ftp lib525 - + FTP PORT upload using multi interface and get 425 response - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test532 b/tests/data/test532 index f36d0440cb..c1d3b0b0c8 100644 --- a/tests/data/test532 +++ b/tests/data/test532 @@ -29,10 +29,10 @@ ftp lib%TESTNUMBER - + FTP RETR same file using reset handles between each transfer - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test533 b/tests/data/test533 index 4e94f88eb6..1dbceb6dd3 100644 --- a/tests/data/test533 +++ b/tests/data/test533 @@ -27,10 +27,10 @@ ftp lib%TESTNUMBER - + FTP RETR a non-existing file twice using the multi interface - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test534 b/tests/data/test534 index 764fe6647d..0e0f35abdd 100644 --- a/tests/data/test534 +++ b/tests/data/test534 @@ -28,10 +28,10 @@ ftp lib533 - + FTP RETR twice using multi: non-existing host and non-existing file - - + + ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test535 b/tests/data/test535 index f9e6c390a6..aa52197767 100644 --- a/tests/data/test535 +++ b/tests/data/test535 @@ -44,10 +44,10 @@ http lib533 - + HTTP GET multi two files with FAILONERROR - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test537 b/tests/data/test537 index ab718fd291..79678c38e9 100644 --- a/tests/data/test537 +++ b/tests/data/test537 @@ -43,10 +43,10 @@ lib%TESTNUMBER ./libtest/lib%TESTNUMBER check - + HTTP GET with a HUGE number of file descriptors open - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test538 b/tests/data/test538 index ff53a8ed6d..a269cdf1a2 100644 --- a/tests/data/test538 +++ b/tests/data/test538 @@ -23,10 +23,10 @@ ftp lib504 - + FTP multi-interface download, failed login: PASS not valid - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test539 b/tests/data/test539 index 12f04e921e..1fb4e12554 100644 --- a/tests/data/test539 +++ b/tests/data/test539 @@ -40,10 +40,10 @@ ftp lib%TESTNUMBER - + Two FTP fetches using different CURLOPT_FTP_FILEMETHOD - - + + ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER diff --git a/tests/data/test54 b/tests/data/test54 index a9efc2929d..8a463118cc 100644 --- a/tests/data/test54 +++ b/tests/data/test54 @@ -22,10 +22,10 @@ This server reply is for testing http - + HTTP with blank Location: - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L diff --git a/tests/data/test540 b/tests/data/test540 index 3e240488ef..ef13108b19 100644 --- a/tests/data/test540 +++ b/tests/data/test540 @@ -69,10 +69,10 @@ lib%TESTNUMBER crypto proxy - + HTTP proxy auth Digest multi API re-using connection - - + + http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name diff --git a/tests/data/test541 b/tests/data/test541 index fbcfeb4d5e..c0677d8ea9 100644 --- a/tests/data/test541 +++ b/tests/data/test541 @@ -19,10 +19,10 @@ ftp lib%TESTNUMBER - + FTP upload and upload same file again without rewind - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test542 b/tests/data/test542 index 0d918fbcd0..b39b1b30d1 100644 --- a/tests/data/test542 +++ b/tests/data/test542 @@ -30,10 +30,10 @@ ftp lib%TESTNUMBER - + FTP a file with NOBODY yes and HEADER no - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test543 b/tests/data/test543 index 2abaa69621..e3ac13bd2f 100644 --- a/tests/data/test543 +++ b/tests/data/test543 @@ -14,10 +14,10 @@ none lib%TESTNUMBER - + curl_easy_escape - - + + - diff --git a/tests/data/test544 b/tests/data/test544 index 390489706d..a35c9cf707 100644 --- a/tests/data/test544 +++ b/tests/data/test544 @@ -29,10 +29,10 @@ http lib%TESTNUMBER - + HTTP POST text data using CURLOPT_COPYPOSTFIELDS - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test545 b/tests/data/test545 index a06b8ebb6e..3827cb9de4 100644 Binary files a/tests/data/test545 and b/tests/data/test545 differ diff --git a/tests/data/test546 b/tests/data/test546 index 6db456f168..f8f01641a0 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -34,10 +34,10 @@ ftp lib533 - + FTP RETR a non-existing file then a found one using the multi interface - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER diff --git a/tests/data/test549 b/tests/data/test549 index c7573a0329..95b2def5cf 100644 --- a/tests/data/test549 +++ b/tests/data/test549 @@ -37,11 +37,11 @@ proxy lib%TESTNUMBER - + FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE - + # first URL then proxy - + ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test55 b/tests/data/test55 index 8786d40b21..ea014f4aae 100644 --- a/tests/data/test55 +++ b/tests/data/test55 @@ -39,10 +39,10 @@ body http - + HTTP follow redirect with single slash in path - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L diff --git a/tests/data/test550 b/tests/data/test550 index 233546b6a1..a4ee2b49b2 100644 --- a/tests/data/test550 +++ b/tests/data/test550 @@ -37,11 +37,11 @@ proxy lib549 - + FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE and ASCII transfer - + # first URL then proxy - + ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii diff --git a/tests/data/test551 b/tests/data/test551 index 2a6b1f5d52..452da3927f 100644 --- a/tests/data/test551 +++ b/tests/data/test551 @@ -65,10 +65,10 @@ lib547 crypto proxy - + HTTP proxy auth Digest with POST data from read callback - - + + http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT s1lly:pers0n diff --git a/tests/data/test552 b/tests/data/test552 index 99202fc224..2658e73e66 100644 --- a/tests/data/test552 +++ b/tests/data/test552 @@ -58,10 +58,10 @@ lib%TESTNUMBER crypto proxy - + HTTP proxy auth Digest with 70K POST data from read callback - - + + http://test.remote.example.com/path/%TESTNUMBER http://s1lly:pers0n@%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test553 b/tests/data/test553 index f640ba4d00..4500751a12 100644 --- a/tests/data/test553 +++ b/tests/data/test553 @@ -31,10 +31,10 @@ lib%TESTNUMBER - + HTTP post with huge request headers and post data from callback - - + + http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER diff --git a/tests/data/test554 b/tests/data/test554 index e0674bdb37..1e2fc5f6b5 100644 --- a/tests/data/test554 +++ b/tests/data/test554 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + HTTP multi-part formpost using read callback for the file part - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test556 b/tests/data/test556 index 6384084d49..e531f012ea 100644 --- a/tests/data/test556 +++ b/tests/data/test556 @@ -27,10 +27,10 @@ http lib%TESTNUMBER - + send and recv HTTP - - + + http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test56 b/tests/data/test56 index b0701194dc..8e4a12a902 100644 --- a/tests/data/test56 +++ b/tests/data/test56 @@ -23,9 +23,9 @@ This is the proof it works http - + HTTP POST with *HUGE* request and chunked transfer-encoding - + # data "we post this" @@ -37,7 +37,7 @@ header "Transfer-Encoding: chunked" -A "%repeat[99999 x a]%" # - + -K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER diff --git a/tests/data/test560 b/tests/data/test560 index 0f9befb543..30641a1668 100644 --- a/tests/data/test560 +++ b/tests/data/test560 @@ -32,10 +32,10 @@ https lib%TESTNUMBER - + simple HTTPS GET with multi interface - - + + https://%HOSTIP:%HTTPSPORT/%TESTNUMBER diff --git a/tests/data/test561 b/tests/data/test561 index a630185b45..09e381745c 100644 --- a/tests/data/test561 +++ b/tests/data/test561 @@ -38,11 +38,11 @@ proxy lib549 - + FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i - + # first URL then proxy - + "ftp://www.example.com/moo/%TESTNUMBER;type=i" http://%HOSTIP:%HTTPPORT ascii diff --git a/tests/data/test562 b/tests/data/test562 index f442a63e57..d1793891d0 100644 --- a/tests/data/test562 +++ b/tests/data/test562 @@ -22,13 +22,13 @@ ftp lib%TESTNUMBER - + FTP a type=A URL and CURLOPT_PORT set - + # note that we need quotes around the URL below to make sure the shell doesn't # treat the semicolon as a separator! - + 'ftp://%HOSTIP:23456/%TESTNUMBER;type=A' %FTPPORT diff --git a/tests/data/test563 b/tests/data/test563 index c19b9026a2..b7c61db768 100644 --- a/tests/data/test563 +++ b/tests/data/test563 @@ -29,9 +29,9 @@ ftp lib562 - + FTP type=A URL and CURLOPT_PORT set and proxy - + proxy @@ -40,7 +40,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/ # note that we need quotes around the URL below to make sure the shell doesn't # treat the semicolon as a separator! - + "ftp://%HOSTIP:23456/%TESTNUMBER;type=A" %FTPPORT diff --git a/tests/data/test564 b/tests/data/test564 index 3d866f2839..96a6f9b1a6 100644 --- a/tests/data/test564 +++ b/tests/data/test564 @@ -32,9 +32,9 @@ socks4 lib%TESTNUMBER - + FTP RETR a file over a SOCKS proxy using the multi interface - + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %HOSTIP:%SOCKSPORT diff --git a/tests/data/test565 b/tests/data/test565 index 92a7a702b2..2587c68d6b 100644 --- a/tests/data/test565 +++ b/tests/data/test565 @@ -66,10 +66,10 @@ crypto lib%TESTNUMBER - + send HTTP POST using read callback, chunked transfer-encoding and Digest - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test566 b/tests/data/test566 index 1fc3968ebb..1ff92f4e21 100644 --- a/tests/data/test566 +++ b/tests/data/test566 @@ -33,10 +33,10 @@ http lib%TESTNUMBER - + HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test57 b/tests/data/test57 index 70b219d917..f177f08eb4 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -22,10 +22,10 @@ Content-Type: text/html; charset=ISO-8859-4 http - + HTTP content-type with spaces in - - + + -w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/out%TESTNUMBER diff --git a/tests/data/test573 b/tests/data/test573 index cab270bb65..67e806dcdf 100644 --- a/tests/data/test573 +++ b/tests/data/test573 @@ -35,10 +35,10 @@ http lib%TESTNUMBER - + verify connect time with multi interface - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test575 b/tests/data/test575 index e84a39f05d..d51c5a08d5 100644 --- a/tests/data/test575 +++ b/tests/data/test575 @@ -23,10 +23,10 @@ ftp lib%TESTNUMBER - + FTP wildcard download - dup_handle and multi interface - - + + ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* diff --git a/tests/data/test576 b/tests/data/test576 index 2a1b9419cf..e8f190156a 100644 --- a/tests/data/test576 +++ b/tests/data/test576 @@ -21,10 +21,10 @@ ftp lib%TESTNUMBER - + FTP wildcard download - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix) - - + + ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* diff --git a/tests/data/test578 b/tests/data/test578 index 9bce5818e5..d909de87ba 100644 --- a/tests/data/test578 +++ b/tests/data/test578 @@ -34,10 +34,10 @@ http lib%TESTNUMBER - + HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test579 b/tests/data/test579 index 3a532d811b..476499ff07 100644 --- a/tests/data/test579 +++ b/tests/data/test579 @@ -64,10 +64,10 @@ crypto lib%TESTNUMBER - + small chunked HTTP POSTs with digest auth. and progress callback - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test58 b/tests/data/test58 index e68cca9262..fd4beac00f 100644 --- a/tests/data/test58 +++ b/tests/data/test58 @@ -25,7 +25,7 @@ http HTTP PUT from file with weird letters - + http://%HOSTIP:%HTTPPORT/we/want/ -T %LOGDIR/%TESTNUMBERte[]st.txt -g diff --git a/tests/data/test580 b/tests/data/test580 index c19a52a30f..63cd0ca0de 100644 --- a/tests/data/test580 +++ b/tests/data/test580 @@ -35,10 +35,10 @@ http lib507 - + multi interface, multiple Location: headers - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test581 b/tests/data/test581 index 50b99e3911..e784e72ea5 100644 --- a/tests/data/test581 +++ b/tests/data/test581 @@ -35,10 +35,10 @@ http lib507 - + multi interface, multiple Content-Type: headers - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test582 b/tests/data/test582 index f626d0bab8..194591b53e 100644 --- a/tests/data/test582 +++ b/tests/data/test582 @@ -20,10 +20,10 @@ sftp lib%TESTNUMBER - + SFTP upload using multi interface - - + + Sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER.txt %USER: %LOGDIR/server/curl_client_key.pub %LOGDIR/server/curl_client_key diff --git a/tests/data/test583 b/tests/data/test583 index 51e435c005..0f49cd9955 100644 --- a/tests/data/test583 +++ b/tests/data/test583 @@ -20,15 +20,15 @@ sftp lib%TESTNUMBER - + SFTP with multi interface, remove handle early - + # The command here uses 'localhost' just to make sure that curl_multi_perform # won't reach too far in the first invoke. When using c-ares at least, the # name resolve will cause it to return rather quickly and thus we could trigger # the problem we're looking to verify. - + sftp://localhost:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %USER: %LOGDIR/server/curl_client_key.pub %LOGDIR/server/curl_client_key diff --git a/tests/data/test584 b/tests/data/test584 index 0f8fe81597..a263e71879 100644 --- a/tests/data/test584 +++ b/tests/data/test584 @@ -47,10 +47,10 @@ http lib%TESTNUMBER - + CURLOPT_MIMEPOST first set then set to NULL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test585 b/tests/data/test585 index 213edef2c6..393498c613 100644 --- a/tests/data/test585 +++ b/tests/data/test585 @@ -46,10 +46,10 @@ http lib%TESTNUMBER - + socket open/close callbacks - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test586 b/tests/data/test586 index 18d614b5d1..b17a702a6b 100644 --- a/tests/data/test586 +++ b/tests/data/test586 @@ -34,10 +34,10 @@ ftp lib585 - + FTP and open/close socket callbacks - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test587 b/tests/data/test587 index 62e54b3b5a..541df4546a 100644 --- a/tests/data/test587 +++ b/tests/data/test587 @@ -28,9 +28,9 @@ http lib%TESTNUMBER - + HTTP multi-part formpost with aborted read callback - + # Add a delay to give server time to write its output since we otherwise might # not even give it enough time to write its lock file. diff --git a/tests/data/test588 b/tests/data/test588 index d36bafee52..9c8c5f3202 100644 --- a/tests/data/test588 +++ b/tests/data/test588 @@ -31,10 +31,10 @@ ftp lib525 - + FTP PORT upload using multi interface, EPRT doesn't work - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test589 b/tests/data/test589 index beafaa7cd3..c798c0eed9 100644 --- a/tests/data/test589 +++ b/tests/data/test589 @@ -33,10 +33,10 @@ http lib%TESTNUMBER - + make an HTTP MIME POST set to NULL - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test59 b/tests/data/test59 index 809e4723d9..b86b02d3d0 100644 --- a/tests/data/test59 +++ b/tests/data/test59 @@ -23,10 +23,10 @@ hej http - + HTTP URL with slash but with "parameter" - - + + "http://%HOSTIP:%HTTPPORT?mooo/%TESTNUMBER" diff --git a/tests/data/test591 b/tests/data/test591 index 528660145e..d1cbf082a4 100644 --- a/tests/data/test591 +++ b/tests/data/test591 @@ -33,10 +33,10 @@ ftp lib%TESTNUMBER - + FTP multi PORT and 425 on upload - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test592 b/tests/data/test592 index e3a9147be7..f77eb9a870 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -33,10 +33,10 @@ ftp lib591 - + FTP multi PORT and 421 on upload - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test593 b/tests/data/test593 index 53a884a0fd..9a15a5184e 100644 --- a/tests/data/test593 +++ b/tests/data/test593 @@ -33,10 +33,10 @@ ftp lib591 - + FTP multi PORT upload, no data conn and no transient neg. reply - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test594 b/tests/data/test594 index dab35062b0..cd98f0b9d8 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -35,10 +35,10 @@ ftp lib591 - + FTP multi PORT upload, no data conn and no positive prelim. reply - - + + ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test595 b/tests/data/test595 index f979746d70..40ace13d5e 100644 --- a/tests/data/test595 +++ b/tests/data/test595 @@ -32,10 +32,10 @@ ftp lib585 - + verify close callbacks with passive FTP - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test596 b/tests/data/test596 index 27d5d849ec..7175c63f8a 100644 --- a/tests/data/test596 +++ b/tests/data/test596 @@ -32,10 +32,10 @@ ftp lib585 - + verify close callbacks with active FTP - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp diff --git a/tests/data/test597 b/tests/data/test597 index 6ab5788779..5402d29b1f 100644 --- a/tests/data/test597 +++ b/tests/data/test597 @@ -14,9 +14,9 @@ ftp lib%TESTNUMBER - + FTP connect only option - + ftp://%HOSTIP:%FTPPORT diff --git a/tests/data/test598 b/tests/data/test598 index a000dca55b..7a6601b9af 100644 --- a/tests/data/test598 +++ b/tests/data/test598 @@ -52,10 +52,10 @@ http lib%TESTNUMBER - + curl_easy_reset with referer and other strings set - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test599 b/tests/data/test599 index 9ca266a3ea..5d334e070b 100644 --- a/tests/data/test599 +++ b/tests/data/test599 @@ -68,10 +68,10 @@ lib%TESTNUMBER # Bug 3510057 pointed out that when following a location to a larger chunked # encoded page, the first size would still be used in the progress callback - + HTTP GET with progress callback and redirects changing content sizes - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test6 b/tests/data/test6 index 6e83125cd4..9c5db36d99 100644 --- a/tests/data/test6 +++ b/tests/data/test6 @@ -25,10 +25,10 @@ swsclose: booo http - + HTTP with simple cookie send - - + + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -b "name=contents;name2=content2" -b name3=content3 diff --git a/tests/data/test60 b/tests/data/test60 index d23918ba88..14338b4401 100644 --- a/tests/data/test60 +++ b/tests/data/test60 @@ -27,7 +27,7 @@ http HTTP PUT from stdin with wrong content-length - + http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER -T - -H "Content-Length: 1" diff --git a/tests/data/test600 b/tests/data/test600 index d110ad15a5..f2d6510ab3 100644 --- a/tests/data/test600 +++ b/tests/data/test600 @@ -20,10 +20,10 @@ for ssh test sftp - + SFTP retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test601 b/tests/data/test601 index 73428decb6..1f01ffd878 100644 --- a/tests/data/test601 +++ b/tests/data/test601 @@ -20,10 +20,10 @@ for ssh test scp - + SCP retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test602 b/tests/data/test602 index 2c89659789..8894c096cf 100644 --- a/tests/data/test602 +++ b/tests/data/test602 @@ -17,10 +17,10 @@ SFTP put sftp - + SFTP put - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure diff --git a/tests/data/test603 b/tests/data/test603 index 7aa20a999d..e98b73d110 100644 --- a/tests/data/test603 +++ b/tests/data/test603 @@ -17,10 +17,10 @@ SCP upload scp - + SCP upload - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure diff --git a/tests/data/test604 b/tests/data/test604 index 14d79335d7..9e129ae5a6 100644 --- a/tests/data/test604 +++ b/tests/data/test604 @@ -12,10 +12,10 @@ FAILURE sftp - + SFTP retrieval of nonexistent file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure diff --git a/tests/data/test605 b/tests/data/test605 index 5c9a266748..380b77a750 100644 --- a/tests/data/test605 +++ b/tests/data/test605 @@ -12,10 +12,10 @@ FAILURE scp - + SCP retrieval of nonexistent file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure diff --git a/tests/data/test606 b/tests/data/test606 index 92764118db..85c462f0f0 100644 --- a/tests/data/test606 +++ b/tests/data/test606 @@ -12,10 +12,10 @@ FAILURE sftp - + SFTP invalid user login - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure diff --git a/tests/data/test607 b/tests/data/test607 index 317f56b9cb..091a73e4c3 100644 --- a/tests/data/test607 +++ b/tests/data/test607 @@ -12,10 +12,10 @@ FAILURE scp - + SCP invalid user login - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure diff --git a/tests/data/test608 b/tests/data/test608 index 5b0bf19009..157713e378 100644 --- a/tests/data/test608 +++ b/tests/data/test608 @@ -20,10 +20,10 @@ Test file for rename test sftp - + SFTP post-quote rename - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/file%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure # Verify that the file was renamed properly, then rename the file back to what diff --git a/tests/data/test609 b/tests/data/test609 index 631aa62e0c..3b9668552d 100644 --- a/tests/data/test609 +++ b/tests/data/test609 @@ -21,10 +21,10 @@ Test file for mkdir test sftp - + SFTP post-quote mkdir failure - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-mkdir %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test61 b/tests/data/test61 index 18e02eb54b..43a8598bab 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -40,16 +40,16 @@ boo http - + HTTP with various cookies and custom Host: - + # Explicitly set the time zone to a known good one, in case the user is # using one of the 'right' zones that take into account leap seconds # which causes the cookie expiry times to be different. TZ=GMT - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" diff --git a/tests/data/test610 b/tests/data/test610 index b3599a2f4f..0ca51f73c8 100644 --- a/tests/data/test610 +++ b/tests/data/test610 @@ -23,10 +23,10 @@ sftp perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP post-quote rmdir - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test611 b/tests/data/test611 index fd9f42fa0e..dc75e20d46 100644 --- a/tests/data/test611 +++ b/tests/data/test611 @@ -23,10 +23,10 @@ sftp perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP post-quote rename - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test612 b/tests/data/test612 index 37ffc5c6cd..2c43f6a0d7 100644 --- a/tests/data/test612 +++ b/tests/data/test612 @@ -20,10 +20,10 @@ Dummy test file for remove test sftp - + SFTP post-quote remove file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure diff --git a/tests/data/test613 b/tests/data/test613 index 8a57ec663d..f8443efa36 100644 --- a/tests/data/test613 +++ b/tests/data/test613 @@ -25,10 +25,10 @@ sftp perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP directory retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure diff --git a/tests/data/test614 b/tests/data/test614 index d7b45a459a..012d6ceecb 100644 --- a/tests/data/test614 +++ b/tests/data/test614 @@ -26,10 +26,10 @@ sftp perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP pre-quote chmod - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure diff --git a/tests/data/test615 b/tests/data/test615 index d2ed914a69..4626d3f1e4 100644 --- a/tests/data/test615 +++ b/tests/data/test615 @@ -16,10 +16,10 @@ sftp perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP put remote failure - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure diff --git a/tests/data/test616 b/tests/data/test616 index 570f1fa11e..0ebc734349 100644 --- a/tests/data/test616 +++ b/tests/data/test616 @@ -19,10 +19,10 @@ zero-length sftp - + SFTP retrieval of empty file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test617 b/tests/data/test617 index 05c2989b7e..0ab6ced01f 100644 --- a/tests/data/test617 +++ b/tests/data/test617 @@ -19,10 +19,10 @@ zero-length scp - + SCP retrieval of empty file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test618 b/tests/data/test618 index 1ffe464483..2094768f30 100644 --- a/tests/data/test618 +++ b/tests/data/test618 @@ -11,10 +11,10 @@ SFTP sftp - + SFTP retrieval of two files - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test619 b/tests/data/test619 index 15309a2579..6c3296c92d 100644 --- a/tests/data/test619 +++ b/tests/data/test619 @@ -11,10 +11,10 @@ SCP scp - + SCP retrieval of two files - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test62 b/tests/data/test62 index 4f3fa2383a..97cef4afac 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -25,10 +25,10 @@ boo http - + HTTP, send cookies when using custom Host: - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" diff --git a/tests/data/test620 b/tests/data/test620 index 2dd3587346..0f32d6fdf4 100644 --- a/tests/data/test620 +++ b/tests/data/test620 @@ -12,10 +12,10 @@ FAILURE sftp - + SFTP retrieval of missing file followed by good file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test621 b/tests/data/test621 index 0c65b13d03..cafd808959 100644 --- a/tests/data/test621 +++ b/tests/data/test621 @@ -12,10 +12,10 @@ FAILURE scp - + SCP retrieval of missing file followed by good file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test622 b/tests/data/test622 index 530bd2207a..014ea96d9e 100644 --- a/tests/data/test622 +++ b/tests/data/test622 @@ -18,10 +18,10 @@ FAILURE sftp - + SFTP put failure - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure diff --git a/tests/data/test623 b/tests/data/test623 index 794a25118c..945079b3f3 100644 --- a/tests/data/test623 +++ b/tests/data/test623 @@ -18,10 +18,10 @@ FAILURE scp - + SCP upload failure - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure diff --git a/tests/data/test624 b/tests/data/test624 index fa7225d68b..3a4ca4b32c 100644 --- a/tests/data/test624 +++ b/tests/data/test624 @@ -18,10 +18,10 @@ SFTP put sftp - + SFTP put with --ftp-create-dirs - - + + --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure diff --git a/tests/data/test625 b/tests/data/test625 index 6ca9f4ea7e..ff7549477a 100644 --- a/tests/data/test625 +++ b/tests/data/test625 @@ -18,10 +18,10 @@ SFTP put sftp - + SFTP put with --ftp-create-dirs twice - - + + --ftp-create-dirs --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure diff --git a/tests/data/test626 b/tests/data/test626 index 87b7944edc..b963b6dedf 100644 --- a/tests/data/test626 +++ b/tests/data/test626 @@ -18,10 +18,10 @@ FAILURE sftp - + SFTP invalid quote command - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test627 b/tests/data/test627 index 98b563fc7f..8ebdc123c0 100644 --- a/tests/data/test627 +++ b/tests/data/test627 @@ -20,10 +20,10 @@ NOBODY sftp - + SFTP quote remove file with NOBODY - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure diff --git a/tests/data/test628 b/tests/data/test628 index 86c00f16d7..755181e319 100644 --- a/tests/data/test628 +++ b/tests/data/test628 @@ -12,10 +12,10 @@ FAILURE sftp - + SFTP invalid user login (password authentication) - - + + -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure diff --git a/tests/data/test629 b/tests/data/test629 index 07ac767ab2..6bf42f4a6c 100644 --- a/tests/data/test629 +++ b/tests/data/test629 @@ -12,10 +12,10 @@ FAILURE scp - + SCP invalid user login (password authentication) - - + + -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure diff --git a/tests/data/test63 b/tests/data/test63 index bf8ebfcf85..3a7e015fd3 100644 --- a/tests/data/test63 +++ b/tests/data/test63 @@ -24,13 +24,13 @@ the content would go here http - + HTTP with proxy authorization set in environment - + http_proxy=http://fake:user@%HOSTIP:%HTTPPORT/ - + http://we.want.that.site.com/%TESTNUMBER diff --git a/tests/data/test630 b/tests/data/test630 index 0aed489aa9..8a5c443883 100644 --- a/tests/data/test630 +++ b/tests/data/test630 @@ -13,10 +13,10 @@ server key check sftp - + SFTP incorrect host key - - + + --hostpubmd5 00000000000000000000000000000000 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test631 b/tests/data/test631 index 4e0630724f..ebf661440a 100644 --- a/tests/data/test631 +++ b/tests/data/test631 @@ -13,10 +13,10 @@ server key check scp - + SCP incorrect host key - - + + --hostpubmd5 00000000000000000000000000000000 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test632 b/tests/data/test632 index 8e3a913b04..475ab2728b 100644 --- a/tests/data/test632 +++ b/tests/data/test632 @@ -16,10 +16,10 @@ none sftp - + SFTP syntactically invalid host key - - + + --hostpubmd5 00 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test633 b/tests/data/test633 index df3403cc80..8f8c4352dc 100644 --- a/tests/data/test633 +++ b/tests/data/test633 @@ -20,10 +20,10 @@ data sftp - + SFTP retrieval with byte range - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-9 --insecure diff --git a/tests/data/test634 b/tests/data/test634 index 3ba7fc6715..3669a8bf99 100644 --- a/tests/data/test634 +++ b/tests/data/test634 @@ -21,10 +21,10 @@ for ssh test sftp - + SFTP retrieval with byte range past end of file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-99 --insecure diff --git a/tests/data/test635 b/tests/data/test635 index 5cdf3420df..b07b5c8237 100644 --- a/tests/data/test635 +++ b/tests/data/test635 @@ -20,10 +20,10 @@ ssh test sftp - + SFTP retrieval with byte range relative to end of file - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r -9 --insecure diff --git a/tests/data/test636 b/tests/data/test636 index 8afa222f7e..96ffc0c136 100644 --- a/tests/data/test636 +++ b/tests/data/test636 @@ -21,10 +21,10 @@ for ssh test sftp - + SFTP retrieval with X- byte range - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5- --insecure diff --git a/tests/data/test637 b/tests/data/test637 index 77d1ed9c6b..df80c483a0 100644 --- a/tests/data/test637 +++ b/tests/data/test637 @@ -19,10 +19,10 @@ Range sftp - + SFTP retrieval with invalid X- range - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 99- --insecure diff --git a/tests/data/test638 b/tests/data/test638 index 10b1b4ff97..b41a3aecf8 100644 --- a/tests/data/test638 +++ b/tests/data/test638 @@ -25,10 +25,10 @@ sftp perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP post-quote rename * asterisk accept-fail - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test639 b/tests/data/test639 index 3c6f50bd71..8105798fd4 100644 --- a/tests/data/test639 +++ b/tests/data/test639 @@ -25,10 +25,10 @@ sftp perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + SFTP post-quote rename * asterisk accept-fail - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test64 b/tests/data/test64 index 8067f1a858..0f0516ea4b 100644 --- a/tests/data/test64 +++ b/tests/data/test64 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with Digest authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test640 b/tests/data/test640 index 816dfd537d..ecfc0934fd 100644 --- a/tests/data/test640 +++ b/tests/data/test640 @@ -19,10 +19,10 @@ NOBODY sftp - + SFTP --head retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head diff --git a/tests/data/test641 b/tests/data/test641 index 3487c90ce3..828198b445 100644 --- a/tests/data/test641 +++ b/tests/data/test641 @@ -19,10 +19,10 @@ NOBODY scp - + SCP --head retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head diff --git a/tests/data/test642 b/tests/data/test642 index f63bbc6603..ccb0c605d3 100644 --- a/tests/data/test642 +++ b/tests/data/test642 @@ -20,10 +20,10 @@ for ssh test sftp - + SFTP retrieval - - + + --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure diff --git a/tests/data/test643 b/tests/data/test643 index 5bb32f4c8f..400d1b9ca5 100644 --- a/tests/data/test643 +++ b/tests/data/test643 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + HTTP multi-part mimepost using read callback for the file part - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test645 b/tests/data/test645 index 971ce5d34b..82ee1d0a2a 100644 --- a/tests/data/test645 +++ b/tests/data/test645 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + HTTP multi-part chunked mimepost using read callback for the file part - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test646 b/tests/data/test646 index f4f1e8828b..4f26dbdf92 100644 --- a/tests/data/test646 +++ b/tests/data/test646 @@ -20,16 +20,16 @@ Mime smtp - + SMTP multipart using mime API - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= This is the html version;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@%LOGDIR/headers%TESTNUMBER" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: " diff --git a/tests/data/test647 b/tests/data/test647 index 5f96a16198..d34fe21f74 100644 --- a/tests/data/test647 +++ b/tests/data/test647 @@ -21,10 +21,10 @@ Mime imap - + IMAP APPEND multipart using mime API - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= This is the html version;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar " -H "To: joe@example.com" -H "Message-Id: " -H "Subject: afternoon meeting" -u user:secret diff --git a/tests/data/test648 b/tests/data/test648 index 5306552a6d..992a3dbc5e 100644 --- a/tests/data/test648 +++ b/tests/data/test648 @@ -20,16 +20,16 @@ Mime smtp - + SMTP multipart with transfer content encoders - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another" diff --git a/tests/data/test649 b/tests/data/test649 index 753c847aae..7751e38f16 100644 --- a/tests/data/test649 +++ b/tests/data/test649 @@ -20,16 +20,16 @@ Mime smtp - + SMTP multipart with 7bit encoder error - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another" diff --git a/tests/data/test65 b/tests/data/test65 index f1ce72bb21..fcf43563fc 100644 --- a/tests/data/test65 +++ b/tests/data/test65 @@ -55,10 +55,10 @@ http !SSPI crypto - + HTTP with Digest authorization with bad password - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest diff --git a/tests/data/test650 b/tests/data/test650 index 7aa88ab2d9..02876fbca1 100644 --- a/tests/data/test650 +++ b/tests/data/test650 @@ -45,13 +45,13 @@ http lib%TESTNUMBER - + HTTP formpost using form API - with redirect and re-POST - + Some data from stdin - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata diff --git a/tests/data/test651 b/tests/data/test651 index bf96b1b0ba..48e42df617 100644 --- a/tests/data/test651 +++ b/tests/data/test651 @@ -34,13 +34,13 @@ http lib%TESTNUMBER - + curl_formadd with huge COPYCONTENTS - + Some data from stdin - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata diff --git a/tests/data/test652 b/tests/data/test652 index 25cbd42429..31ec7b821d 100644 --- a/tests/data/test652 +++ b/tests/data/test652 @@ -24,10 +24,10 @@ smtp lib%TESTNUMBER - + SMTP with encoded huge mime data contents - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER diff --git a/tests/data/test653 b/tests/data/test653 index 58c0748ba5..33885f17fa 100644 --- a/tests/data/test653 +++ b/tests/data/test653 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + Reuse of handle after altering mime data - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test654 b/tests/data/test654 index e022dc529c..47415e209b 100644 --- a/tests/data/test654 +++ b/tests/data/test654 @@ -50,10 +50,10 @@ http lib%TESTNUMBER - + HTTP duplicate easy handle with mime data - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test655 b/tests/data/test655 index 3f9bc785fb..583e7c0a02 100644 --- a/tests/data/test655 +++ b/tests/data/test655 @@ -32,10 +32,10 @@ http lib%TESTNUMBER - + resolver start callback - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test656 b/tests/data/test656 index fff647ca39..9478757d5b 100644 --- a/tests/data/test656 +++ b/tests/data/test656 @@ -12,10 +12,10 @@ FAILURE sftp - + SFTP retrieval with nonexistent private key file - - + + --key DOES_NOT_EXIST --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/not-a-valid-file-moooo --insecure --connect-timeout 8 diff --git a/tests/data/test658 b/tests/data/test658 index df5be763f9..32ca29db49 100644 --- a/tests/data/test658 +++ b/tests/data/test658 @@ -31,8 +31,8 @@ lib%TESTNUMBER Pass URL to libcurl with CURLOPT_CURLU - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test659 b/tests/data/test659 index ef7cf12efd..5cad5eadcd 100644 --- a/tests/data/test659 +++ b/tests/data/test659 @@ -32,8 +32,8 @@ lib%TESTNUMBER CURLOPT_CURLU without the path set - over proxy - - + + http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test66 b/tests/data/test66 index 0e66289bba..13aa08384f 100644 --- a/tests/data/test66 +++ b/tests/data/test66 @@ -21,10 +21,10 @@ no headers swsclose http - + HTTP GET without headers in the response - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test660 b/tests/data/test660 index b53d47bce8..8fdf879d9a 100644 --- a/tests/data/test660 +++ b/tests/data/test660 @@ -14,9 +14,9 @@ imap lib597 - + IMAP CONNECT_ONLY option - + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER diff --git a/tests/data/test661 b/tests/data/test661 index ccfdf41ff3..5965bd8aea 100644 --- a/tests/data/test661 +++ b/tests/data/test661 @@ -22,10 +22,10 @@ ftp lib%TESTNUMBER - + Avoid redundant CWDs - - + + ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test662 b/tests/data/test662 index 5edaf05e7f..a1d501fd2d 100644 --- a/tests/data/test662 +++ b/tests/data/test662 @@ -46,10 +46,10 @@ body http - + HTTP redirect with whitespace in absolute Location: URL - - + + http://example.com/please/gimme/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test663 b/tests/data/test663 index 72692585fd..313910aa6b 100644 --- a/tests/data/test663 +++ b/tests/data/test663 @@ -50,10 +50,10 @@ body http - + HTTP redirect with dotdots and whitespaces in absolute Location: URL - - + + http://example.com/please/../gimme/%TESTNUMBER?foobar#hello -L -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test664 b/tests/data/test664 index 69404ef4f4..6ef1d90cbe 100644 --- a/tests/data/test664 +++ b/tests/data/test664 @@ -20,10 +20,10 @@ test sftp - + SFTP correct host key - - + + --hostpubmd5 %SSHSRVMD5 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test665 b/tests/data/test665 index 07aea62af7..bdab82945a 100644 --- a/tests/data/test665 +++ b/tests/data/test665 @@ -20,10 +20,10 @@ test scp - + SCP correct host key - - + + --hostpubmd5 %SSHSRVMD5 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test666 b/tests/data/test666 index 2ab29160fb..ecb35ec372 100644 --- a/tests/data/test666 +++ b/tests/data/test666 @@ -42,10 +42,10 @@ http lib%TESTNUMBER - + HTTP mime post with binary-encoded huge data contents - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test667 b/tests/data/test667 index 222d3c6fbe..d62a81d0fb 100644 --- a/tests/data/test667 +++ b/tests/data/test667 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + HTTP chunked mimepost using single-byte read callback with encoder - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test668 b/tests/data/test668 index 9f5aee34f4..14905ddc60 100644 --- a/tests/data/test668 +++ b/tests/data/test668 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + HTTP mimepost early end of data detection - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/file%TESTNUMBER.txt diff --git a/tests/data/test669 b/tests/data/test669 index eaa6ec9bbd..620aa3393d 100644 --- a/tests/data/test669 +++ b/tests/data/test669 @@ -27,10 +27,10 @@ Mime http - + HTTP custom Content-Type with parameter - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-data; charset=utf-8' -F name=daniel -F tool=curl diff --git a/tests/data/test670 b/tests/data/test670 index 42e18bfc6c..94910b5362 100644 --- a/tests/data/test670 +++ b/tests/data/test670 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + Request pause from mime read callback: multi - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test671 b/tests/data/test671 index c222cee876..e49aacd51a 100644 --- a/tests/data/test671 +++ b/tests/data/test671 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + Request pause from mime read callback: easy - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test672 b/tests/data/test672 index b105875c02..387058d891 100644 --- a/tests/data/test672 +++ b/tests/data/test672 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + Request pause from form read callback: multi - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test673 b/tests/data/test673 index ba20d0928c..5cc3e015a3 100644 --- a/tests/data/test673 +++ b/tests/data/test673 @@ -43,10 +43,10 @@ http lib%TESTNUMBER - + Request pause from form read callback: easy - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test674 b/tests/data/test674 index 1afe1f695e..2043b3d4ae 100644 --- a/tests/data/test674 +++ b/tests/data/test674 @@ -32,8 +32,8 @@ lib%TESTNUMBER Set CURLOPT_CURLU and dupe the handle - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test675 b/tests/data/test675 index 0e471eba92..82ae14031f 100644 --- a/tests/data/test675 +++ b/tests/data/test675 @@ -23,9 +23,9 @@ the content would go here http - + HTTP connection reuse and different credentials - + http://user1:foo1@%HOSTIP:%HTTPPORT/user1/%TESTNUMBER http://user2:foo2@%HOSTIP:%HTTPPORT/user2/%TESTNUMBER diff --git a/tests/data/test676 b/tests/data/test676 index 601184fe95..031395eb8e 100644 --- a/tests/data/test676 +++ b/tests/data/test676 @@ -55,10 +55,10 @@ http lib%TESTNUMBER - + verify setting CURLOPT_COOKIEFILE to NULL again - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies676 diff --git a/tests/data/test677 b/tests/data/test677 index e3d9041fdf..166be89543 100644 --- a/tests/data/test677 +++ b/tests/data/test677 @@ -19,9 +19,9 @@ CONNECT_ONLY imap - + IMAP with CONNECT_ONLY, custom command then exit - + lib%TESTNUMBER diff --git a/tests/data/test678 b/tests/data/test678 index 69ae232b31..42bc70eac5 100644 --- a/tests/data/test678 +++ b/tests/data/test678 @@ -29,9 +29,9 @@ SSL https Server-localhost-sv.pem - + HTTPS GET using CURLOPT_CAINFO_BLOB - + lib%TESTNUMBER diff --git a/tests/data/test679 b/tests/data/test679 index d435ae0dbb..1ad174704c 100644 --- a/tests/data/test679 +++ b/tests/data/test679 @@ -30,10 +30,10 @@ Funny-head: yesyes http - + netrc with quoted password - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test680 b/tests/data/test680 index 2cd0d47fe0..5ea3eaa646 100644 --- a/tests/data/test680 +++ b/tests/data/test680 @@ -19,10 +19,10 @@ none http - + netrc with quoted password but missing end quote - - + + --netrc --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@http.example/ diff --git a/tests/data/test682 b/tests/data/test682 index 0e3a789e65..fc21899185 100644 --- a/tests/data/test682 +++ b/tests/data/test682 @@ -26,10 +26,10 @@ Connection: close http - + netrc with multiple logins - pick first - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test683 b/tests/data/test683 index 4cbf5f077d..9eb250fbd7 100644 --- a/tests/data/test683 +++ b/tests/data/test683 @@ -26,10 +26,10 @@ Connection: close http - + netrc with multiple logins - pick second - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test684 b/tests/data/test684 index 712ee3be07..a63424e250 100644 --- a/tests/data/test684 +++ b/tests/data/test684 @@ -26,10 +26,10 @@ Connection: close http - + netrc with no login - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test685 b/tests/data/test685 index 9d64fe7884..bdb2124b4b 100644 --- a/tests/data/test685 +++ b/tests/data/test685 @@ -26,10 +26,10 @@ Connection: close http - + netrc with no login - provided user - - + + --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/ diff --git a/tests/data/test686 b/tests/data/test686 index 0badad0623..6189d7a174 100644 --- a/tests/data/test686 +++ b/tests/data/test686 @@ -16,10 +16,10 @@ errorcode none - + verify return code for missing URL after --next - - + + htdhdhdtp://localhost --next diff --git a/tests/data/test7 b/tests/data/test7 index b7487ffb70..e98d5f5b1b 100644 --- a/tests/data/test7 +++ b/tests/data/test7 @@ -28,10 +28,10 @@ Set-Cookie: partmatch=present; domain=.0.0.1; path=/; http - + HTTP with cookie parser and header recording - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test70 b/tests/data/test70 index 622b9a9c52..69cba7da47 100644 --- a/tests/data/test70 +++ b/tests/data/test70 @@ -58,10 +58,10 @@ NTLM http - + HTTP with Digest *OR* NTLM authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test700 b/tests/data/test700 index e2a0d3320d..fb59098354 100644 --- a/tests/data/test700 +++ b/tests/data/test700 @@ -36,10 +36,10 @@ proxy http socks4 - + HTTP GET via SOCKS4 proxy - - + + --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test701 b/tests/data/test701 index f4cd7f14b3..b7a9091a98 100644 --- a/tests/data/test701 +++ b/tests/data/test701 @@ -36,10 +36,10 @@ proxy http socks5 - + HTTP GET via SOCKS5 proxy - - + + --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test702 b/tests/data/test702 index 4e06f88890..559636d36f 100644 --- a/tests/data/test702 +++ b/tests/data/test702 @@ -30,10 +30,10 @@ socks4 http proxy - + Attempt connect to non-listening HTTP server via SOCKS4 proxy - - + + --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%NOLISTENPORT diff --git a/tests/data/test703 b/tests/data/test703 index 3c3487aeec..67bf998760 100644 --- a/tests/data/test703 +++ b/tests/data/test703 @@ -27,10 +27,10 @@ socks5 http proxy - + Attempt connect to non-listening HTTP server via SOCKS5 proxy - - + + --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%NOLISTENPORT diff --git a/tests/data/test704 b/tests/data/test704 index b9abc45e12..67bee39c16 100644 --- a/tests/data/test704 +++ b/tests/data/test704 @@ -19,10 +19,10 @@ FAILURE http - + Attempt connect to non-listening SOCKS4 proxy - - + + --socks4 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test705 b/tests/data/test705 index 5d3692dc40..ed23bafe71 100644 --- a/tests/data/test705 +++ b/tests/data/test705 @@ -19,10 +19,10 @@ FAILURE http - + Attempt connect to non-listening SOCKS5 proxy - - + + --socks5 %HOSTIP:%NOLISTENPORT http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test706 b/tests/data/test706 index 873f129892..656b3dd8b7 100644 --- a/tests/data/test706 +++ b/tests/data/test706 @@ -38,10 +38,10 @@ proxy ftp socks4 - + FTP dir list PASV via SOCKS4 - - + + --socks4 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test707 b/tests/data/test707 index e589193453..3ed89ec627 100644 --- a/tests/data/test707 +++ b/tests/data/test707 @@ -38,10 +38,10 @@ proxy ftp socks5 - + FTP dir list PASV via SOCKS5 - - + + --socks5 %HOSTIP:%SOCKSPORT ftp://%HOSTIP:%FTPPORT/ diff --git a/tests/data/test708 b/tests/data/test708 index 72f4dcec8e..d6797dc65f 100644 --- a/tests/data/test708 +++ b/tests/data/test708 @@ -39,10 +39,10 @@ socks4 all_proxy=socks4://%HOSTIP:%SOCKSPORT - + HTTP GET via SOCKS4 proxy - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test709 b/tests/data/test709 index d6380aff2b..656675395c 100644 --- a/tests/data/test709 +++ b/tests/data/test709 @@ -39,10 +39,10 @@ socks5 http_proxy=socks5://%HOSTIP:%SOCKSPORT - + HTTP GET via SOCKS5 set in http_proxy environment variable - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test71 b/tests/data/test71 index 2b8c3cab47..f47879a3f7 100644 --- a/tests/data/test71 +++ b/tests/data/test71 @@ -27,16 +27,16 @@ Mime http - + HTTP and -F upload in config file - + -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt user-agent = "" - + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K - # We create this file before the command is invoked! diff --git a/tests/data/test710 b/tests/data/test710 index 20a1af0533..02033831b6 100644 --- a/tests/data/test710 +++ b/tests/data/test710 @@ -36,10 +36,10 @@ proxy http socks5 - + HTTP GET via SOCKS5 set with --proxy - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test711 b/tests/data/test711 index e5f1c39fd6..355ca0e51e 100644 --- a/tests/data/test711 +++ b/tests/data/test711 @@ -32,10 +32,10 @@ socks5 all_proxy=socks5://%HOSTIP:%SOCKSPORT - + FTP fetch with all_proxy set to socks5 - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER diff --git a/tests/data/test712 b/tests/data/test712 index 76859f4531..7bcc2a1bbb 100644 --- a/tests/data/test712 +++ b/tests/data/test712 @@ -26,10 +26,10 @@ proxy ftp socks5 - + FTP fetch with --proxy set to socks5:// - - + + ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test713 b/tests/data/test713 index 73fd5e956a..44820a78ff 100644 --- a/tests/data/test713 +++ b/tests/data/test713 @@ -27,10 +27,10 @@ proxy ftp socks5 - + FTP fetch with --proxy set to socks5:// and with --connect-to - - + + ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test714 b/tests/data/test714 index 82e1449f08..a38400bb80 100644 --- a/tests/data/test714 +++ b/tests/data/test714 @@ -46,10 +46,10 @@ http-proxy http proxy - + FTP fetch with --proxy set to http:// and with --connect-to - - + + ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy http://%HOSTIP:%PROXYPORT diff --git a/tests/data/test715 b/tests/data/test715 index 5c62273888..6f9670af54 100644 --- a/tests/data/test715 +++ b/tests/data/test715 @@ -48,10 +48,10 @@ socks5 http proxy - + FTP fetch with --preproxy, --proxy and --connect-to - - + + ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com.%TESTNUMBER:%FTPPORT --proxytunnel --proxy %HOSTIP:%PROXYPORT --preproxy socks5://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test716 b/tests/data/test716 index 4de1cd95fd..5c20b45a75 100644 --- a/tests/data/test716 +++ b/tests/data/test716 @@ -30,7 +30,7 @@ SOCKS5 proxy with too long user name # it should never connect to the target server - + http://hohoho.example.com:99/%TESTNUMBER -x socks5://AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:b@%HOSTIP:%SOCKSPORT diff --git a/tests/data/test717 b/tests/data/test717 index bbbc9ed3fc..54ab955680 100644 --- a/tests/data/test717 +++ b/tests/data/test717 @@ -44,7 +44,7 @@ SOCKS5 proxy auth # target a port that won't work without the SOCKS magic - + http://%HOSTIP:1/%TESTNUMBER -x socks5://uz3r:p4ssworm@%HOSTIP:%SOCKSPORT diff --git a/tests/data/test718 b/tests/data/test718 index 613647aa0e..dcbf7d77a1 100644 --- a/tests/data/test718 +++ b/tests/data/test718 @@ -37,10 +37,10 @@ http crypto proxy - + HTTP proxy CONNECT (no auth) with proxy returning 407 and closing - - + + http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel diff --git a/tests/data/test719 b/tests/data/test719 index d42f051b5e..63cb888863 100644 --- a/tests/data/test719 +++ b/tests/data/test719 @@ -38,10 +38,10 @@ proxy http socks5 - + HTTP GET with IPv6 numerical via SOCKS5h - - + + http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test72 b/tests/data/test72 index 00c4c6421a..176d0dff8e 100644 --- a/tests/data/test72 +++ b/tests/data/test72 @@ -57,10 +57,10 @@ http !SSPI crypto - + HTTP with Digest *OR* Basic authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth diff --git a/tests/data/test720 b/tests/data/test720 index ffdee1d691..709656a280 100644 --- a/tests/data/test720 +++ b/tests/data/test720 @@ -37,10 +37,10 @@ proxy http socks5 - + HTTP GET with IPv4 numerical via SOCKS5h - - + + http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test721 b/tests/data/test721 index 3092eaac69..db63a8f6b5 100644 --- a/tests/data/test721 +++ b/tests/data/test721 @@ -37,10 +37,10 @@ proxy http socks5 - + HTTP GET with host name using SOCKS5h - - + + http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT diff --git a/tests/data/test722 b/tests/data/test722 index 25fdbe1612..674efd14a2 100644 --- a/tests/data/test722 +++ b/tests/data/test722 @@ -30,10 +30,10 @@ Hello curl from IPFS http - + IPFS - - + + --ipfs-gateway http://%HOSTIP:%HTTPPORT/%TESTNUMBER ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test723 b/tests/data/test723 index b69e435e46..aaf4d27a3a 100644 --- a/tests/data/test723 +++ b/tests/data/test723 @@ -16,10 +16,10 @@ IPFS http - + IPFS with malformed gateway URL (bad function argument error) - - + + --ipfs-gateway http://nonexisting,local:8080/%TESTNUMBER ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test724 b/tests/data/test724 index fa45c6d41d..692046b31e 100644 --- a/tests/data/test724 +++ b/tests/data/test724 @@ -33,10 +33,10 @@ http HOME=%PWD/%LOGDIR - + IPFS with gateway URL from gateway file - - + + ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test725 b/tests/data/test725 index 3690f1f411..cf3c19664f 100644 --- a/tests/data/test725 +++ b/tests/data/test725 @@ -19,10 +19,10 @@ http HOME=%PWD/%LOGDIR - + IPFS with malformed gateway URL from gateway file - - + + ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test726 b/tests/data/test726 index 5e41d730a7..c0abbf29c1 100644 --- a/tests/data/test726 +++ b/tests/data/test726 @@ -22,10 +22,10 @@ http # This is to prevent the automatic gateway detection from finding a gateway file in your home folder. HOME=%PWD - + IPFS with no gateway URL (no environment or home file either) - - + + ipfs://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test727 b/tests/data/test727 index ee7f271b4e..e71ef5f446 100644 --- a/tests/data/test727 +++ b/tests/data/test727 @@ -30,10 +30,10 @@ Hello curl from IPNS http - + IPNS - - + + --ipfs-gateway http://%HOSTIP:%HTTPPORT/%TESTNUMBER ipns://QmV5JejrpgUxnkZeFZYMxVCqAbKy3KdPXWXyuEDiMNZwUx diff --git a/tests/data/test73 b/tests/data/test73 index c5c2c009a0..1edcbdcb90 100644 --- a/tests/data/test73 +++ b/tests/data/test73 @@ -25,10 +25,10 @@ boo http - + HTTP, receive cookies when using custom Host:, domain using only two dots - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se" diff --git a/tests/data/test74 b/tests/data/test74 index a2ecdd98bb..d9316f0e67 100644 --- a/tests/data/test74 +++ b/tests/data/test74 @@ -39,9 +39,9 @@ crap data http - + HTTP, urlglob {}-retrieval and -o #[num] usage - + "http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump" diff --git a/tests/data/test75 b/tests/data/test75 index b11295c991..dc8b49979f 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -21,9 +21,9 @@ none http - + HTTP, urlglob retrieval with bad range - + "http://a-site-never-accessed.example.org/[2-1]" -o "%LOGDIR/weee#1.dump" --stderr - diff --git a/tests/data/test76 b/tests/data/test76 index 8aae75aecb..4c83566dd2 100644 --- a/tests/data/test76 +++ b/tests/data/test76 @@ -18,9 +18,9 @@ none http - + HTTP, -O with no file name part in the URL - + http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER/ -O diff --git a/tests/data/test77 b/tests/data/test77 index d7cce4035d..baa9bfc360 100644 --- a/tests/data/test77 +++ b/tests/data/test77 @@ -31,10 +31,10 @@ Content-Type: text/html http - + HTTP with -z "older date" - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT" diff --git a/tests/data/test78 b/tests/data/test78 index 60c4029b7f..d52fb15548 100644 --- a/tests/data/test78 +++ b/tests/data/test78 @@ -43,10 +43,10 @@ Funny-head: yesyes http - + HTTP with -z "newer date" - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" diff --git a/tests/data/test79 b/tests/data/test79 index 88e9b78e4c..e836b3bf5c 100644 --- a/tests/data/test79 +++ b/tests/data/test79 @@ -31,10 +31,10 @@ http ftp proxy - + FTP over HTTP proxy - - + + ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test799 b/tests/data/test799 index 9849512608..e8563a598f 100644 --- a/tests/data/test799 +++ b/tests/data/test799 @@ -31,10 +31,10 @@ body imap - + IMAP with --login-options 'AUTH=+LOGIN' - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --login-options AUTH=+LOGIN diff --git a/tests/data/test8 b/tests/data/test8 index 7d087f337d..9e58188151 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -21,10 +21,10 @@ Server: test-server/fake http - + HTTP with cookie parsing from header file - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test80 b/tests/data/test80 index ef62f5228b..21d9fd2ea5 100644 --- a/tests/data/test80 +++ b/tests/data/test80 @@ -49,10 +49,10 @@ contents http http-proxy - + HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication - - + + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself diff --git a/tests/data/test800 b/tests/data/test800 index 9f961ebc98..a2daf240a7 100644 --- a/tests/data/test800 +++ b/tests/data/test800 @@ -27,10 +27,10 @@ body imap - + IMAP FETCH message - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' diff --git a/tests/data/test801 b/tests/data/test801 index dcfa18cf63..9b68d62a86 100644 --- a/tests/data/test801 +++ b/tests/data/test801 @@ -24,10 +24,10 @@ body imap - + IMAP FETCH message by MAILINDEX and SECTION - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret diff --git a/tests/data/test802 b/tests/data/test802 index 76ede9e9da..1e2e35bfa0 100644 --- a/tests/data/test802 +++ b/tests/data/test802 @@ -25,10 +25,10 @@ body imap - + IMAP SELECT UIDVALIDITY Success - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=3857529045/;MAILINDEX=123/;SECTION=TEXT' -u user:secret diff --git a/tests/data/test803 b/tests/data/test803 index f16a419aa2..6fb00eb0a6 100644 --- a/tests/data/test803 +++ b/tests/data/test803 @@ -20,10 +20,10 @@ FAILURE imap - + IMAP SELECT UIDVALIDITY Failure - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER;UIDVALIDITY=12345/;MAILINDEX=123' -u user:secret diff --git a/tests/data/test804 b/tests/data/test804 index 1626cf88c6..420dfb70c6 100644 --- a/tests/data/test804 +++ b/tests/data/test804 @@ -24,10 +24,10 @@ body imap - + IMAP doesn't perform SELECT if re-using the same mailbox - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=456/;SECTION=2.3' -u user:secret diff --git a/tests/data/test805 b/tests/data/test805 index 07fb97cfa5..7370e63604 100644 --- a/tests/data/test805 +++ b/tests/data/test805 @@ -19,10 +19,10 @@ UPLOAD imap - + IMAP APPEND message - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret diff --git a/tests/data/test806 b/tests/data/test806 index 128ad85bc2..adfbc11212 100644 --- a/tests/data/test806 +++ b/tests/data/test806 @@ -23,10 +23,10 @@ LIST imap - + IMAP LIST mailbox - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test807 b/tests/data/test807 index 59c12eb288..80a1044da0 100644 --- a/tests/data/test807 +++ b/tests/data/test807 @@ -24,10 +24,10 @@ CUSTOMREQUEST imap - + IMAP LSUB mailbox - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *' diff --git a/tests/data/test808 b/tests/data/test808 index a77589a7cc..542f87e6d6 100644 --- a/tests/data/test808 +++ b/tests/data/test808 @@ -28,10 +28,10 @@ CUSTOMREQUEST imap - + IMAP EXAMINE mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER' diff --git a/tests/data/test809 b/tests/data/test809 index 8122eaf698..25635d21f0 100644 --- a/tests/data/test809 +++ b/tests/data/test809 @@ -22,10 +22,10 @@ CUSTOMREQUEST imap - + IMAP mailbox STATUS (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES)' diff --git a/tests/data/test810 b/tests/data/test810 index 80aac560e1..37d76f6ba0 100644 --- a/tests/data/test810 +++ b/tests/data/test810 @@ -21,10 +21,10 @@ SEARCH imap - + IMAP SEARCH for NEW messages - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret diff --git a/tests/data/test811 b/tests/data/test811 index f0938be118..e2520c3319 100644 --- a/tests/data/test811 +++ b/tests/data/test811 @@ -19,10 +19,10 @@ CUSTOMREQUEST imap - + IMAP CREATE mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER' diff --git a/tests/data/test812 b/tests/data/test812 index 8374ea0936..0180e023e8 100644 --- a/tests/data/test812 +++ b/tests/data/test812 @@ -19,10 +19,10 @@ CUSTOMREQUEST imap - + IMAP DELETE mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER' diff --git a/tests/data/test813 b/tests/data/test813 index 2e8c42d0cf..674d308fd7 100644 --- a/tests/data/test813 +++ b/tests/data/test813 @@ -19,10 +19,10 @@ CUSTOMREQUEST imap - + IMAP RENAME mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER' diff --git a/tests/data/test814 b/tests/data/test814 index c673c43558..e73b0e894a 100644 --- a/tests/data/test814 +++ b/tests/data/test814 @@ -19,10 +19,10 @@ CUSTOMREQUEST imap - + IMAP CHECK mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK' diff --git a/tests/data/test815 b/tests/data/test815 index 4ac24f3adf..04daef90f0 100644 --- a/tests/data/test815 +++ b/tests/data/test815 @@ -23,10 +23,10 @@ CUSTOMREQUEST imap - + IMAP STORE - delete message (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X CLOSE -u user:secret diff --git a/tests/data/test816 b/tests/data/test816 index cf4702d149..b6054cacfc 100644 --- a/tests/data/test816 +++ b/tests/data/test816 @@ -26,10 +26,10 @@ CUSTOMREQUEST imap - + IMAP STORE - delete message with confirmation (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X EXPUNGE -u user:secret diff --git a/tests/data/test817 b/tests/data/test817 index 9efa06d46e..c608f65b0f 100644 --- a/tests/data/test817 +++ b/tests/data/test817 @@ -19,10 +19,10 @@ CUSTOMREQUEST imap - + IMAP COPY message to mailbox (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER' diff --git a/tests/data/test818 b/tests/data/test818 index 95282c4e36..dd917ea399 100644 --- a/tests/data/test818 +++ b/tests/data/test818 @@ -25,10 +25,10 @@ CUSTOMREQUEST imap - + IMAP NOOP (CUSTOMREQUEST) - - + + imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret diff --git a/tests/data/test819 b/tests/data/test819 index d2f0db201c..50ff226691 100644 --- a/tests/data/test819 +++ b/tests/data/test819 @@ -33,10 +33,10 @@ body imap - + IMAP plain authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test82 b/tests/data/test82 index 9139833230..a4286ad096 100644 --- a/tests/data/test82 +++ b/tests/data/test82 @@ -31,10 +31,10 @@ proxy http - + HTTP with proxy requiring NTLM, but we send Basic - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test820 b/tests/data/test820 index 8b684acad6..80ac25f27d 100644 --- a/tests/data/test820 +++ b/tests/data/test820 @@ -33,10 +33,10 @@ body imap - + IMAP login authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test821 b/tests/data/test821 index 179574beed..101c40084d 100644 --- a/tests/data/test821 +++ b/tests/data/test821 @@ -36,10 +36,10 @@ imap crypto - + IMAP CRAM-MD5 authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test823 b/tests/data/test823 index affb6772d6..18ed5fa674 100644 --- a/tests/data/test823 +++ b/tests/data/test823 @@ -39,10 +39,10 @@ imap debug crypto - + IMAP DIGEST-MD5 authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test824 b/tests/data/test824 index 28630e4803..0abda22b0a 100644 --- a/tests/data/test824 +++ b/tests/data/test824 @@ -33,10 +33,10 @@ body imap - + IMAP OAuth 2.0 (XOAUTH2) authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test825 b/tests/data/test825 index fd4e047a38..64d57f5feb 100644 --- a/tests/data/test825 +++ b/tests/data/test825 @@ -34,10 +34,10 @@ body imap - + IMAP plain authentication with initial response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test826 b/tests/data/test826 index 19247f0ec1..b3b0dc335f 100644 --- a/tests/data/test826 +++ b/tests/data/test826 @@ -34,10 +34,10 @@ body imap - + IMAP login authentication with initial response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test828 b/tests/data/test828 index 40f2b1252f..a3548464e8 100644 --- a/tests/data/test828 +++ b/tests/data/test828 @@ -34,10 +34,10 @@ body imap - + IMAP OAuth 2.0 (XOAUTH2) authentication with initial response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test829 b/tests/data/test829 index 46ff4e165a..b9f7da03cc 100644 --- a/tests/data/test829 +++ b/tests/data/test829 @@ -11,10 +11,10 @@ CRLF-in-URL imap - + IMAP with URL-encoded CR LF in the URL - - + + imap://%HOSTIP:%IMAPPORT/%0d%0a/%TESTNUMBER diff --git a/tests/data/test83 b/tests/data/test83 index dffdb92a58..51a3e3b68b 100644 --- a/tests/data/test83 +++ b/tests/data/test83 @@ -46,10 +46,10 @@ contents http http-proxy - + HTTP over proxy-tunnel with site authentication - - + + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT --user 'iam:my:;self' diff --git a/tests/data/test830 b/tests/data/test830 index d02ed6b08f..64172f1b5a 100644 --- a/tests/data/test830 +++ b/tests/data/test830 @@ -29,10 +29,10 @@ imap crypto - + IMAP CRAM-MD5 graceful cancellation - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test831 b/tests/data/test831 index 99e0fa4b29..382432368d 100644 --- a/tests/data/test831 +++ b/tests/data/test831 @@ -31,16 +31,16 @@ NTLM SSL !SSPI - + IMAP NTLM graceful cancellation - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u testuser:testpass diff --git a/tests/data/test832 b/tests/data/test832 index dc15aa716f..6001c1d450 100644 --- a/tests/data/test832 +++ b/tests/data/test832 @@ -31,10 +31,10 @@ imap debug crypto - + IMAP DIGEST-MD5 graceful cancellation - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test833 b/tests/data/test833 index 5784c41640..f958df4cb3 100644 --- a/tests/data/test833 +++ b/tests/data/test833 @@ -40,10 +40,10 @@ imap crypto - + IMAP CRAM-MD5 authentication with SASL downgrade - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test834 b/tests/data/test834 index f99d9dd5dc..e142ca2196 100644 --- a/tests/data/test834 +++ b/tests/data/test834 @@ -42,16 +42,16 @@ NTLM SSL !SSPI - + IMAP NTLM authentication with SASL downgrade - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test835 b/tests/data/test835 index fd6badde12..ee6ed31d14 100644 --- a/tests/data/test835 +++ b/tests/data/test835 @@ -42,10 +42,10 @@ imap debug crypto - + IMAP DIGEST-MD5 authentication with SASL downgrade - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret diff --git a/tests/data/test836 b/tests/data/test836 index 0e7914f626..821d5392bb 100644 --- a/tests/data/test836 +++ b/tests/data/test836 @@ -32,10 +32,10 @@ body imap - + IMAP multiple connection authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user.one:secret -: 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=2' -u user.two:secret diff --git a/tests/data/test837 b/tests/data/test837 index 2e46be622e..74b575a6ed 100644 --- a/tests/data/test837 +++ b/tests/data/test837 @@ -33,10 +33,10 @@ body imap - + IMAP external authentication - - + + 'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test838 b/tests/data/test838 index 11ed7aaf09..c6081fb638 100644 --- a/tests/data/test838 +++ b/tests/data/test838 @@ -33,10 +33,10 @@ body imap - + IMAP external authentication without credentials - - + + 'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test839 b/tests/data/test839 index 8240bf3973..9f443b42aa 100644 --- a/tests/data/test839 +++ b/tests/data/test839 @@ -34,10 +34,10 @@ body imap - + IMAP external authentication with initial response - - + + 'imap://user;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test84 b/tests/data/test84 index cc7626294c..3b842eaffe 100644 --- a/tests/data/test84 +++ b/tests/data/test84 @@ -27,10 +27,10 @@ contents http - + HTTP over proxy with site authentication - - + + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself diff --git a/tests/data/test840 b/tests/data/test840 index 551005359d..48fd32a349 100644 --- a/tests/data/test840 +++ b/tests/data/test840 @@ -34,10 +34,10 @@ body imap - + IMAP external authentication with initial response without credentials - - + + 'imap://;AUTH=EXTERNAL@%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test841 b/tests/data/test841 index c5258c920e..cc1d075fbc 100644 --- a/tests/data/test841 +++ b/tests/data/test841 @@ -29,10 +29,10 @@ body imap - + IMAP custom request doesn't check continuation data - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/ -u user:secret -X 'FETCH 123 BODY[1]' diff --git a/tests/data/test842 b/tests/data/test842 index 42148d03ea..1cea6e39d3 100644 --- a/tests/data/test842 +++ b/tests/data/test842 @@ -34,10 +34,10 @@ body imap - + IMAP OAuth 2.0 (OAUTHBEARER) authentication - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM # The protocol section doesn't support ways of specifying the raw data in the diff --git a/tests/data/test843 b/tests/data/test843 index dcf5c1be40..774c4c5e74 100644 --- a/tests/data/test843 +++ b/tests/data/test843 @@ -35,10 +35,10 @@ body imap - + IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test844 b/tests/data/test844 index 83dff8e597..fd65d750c6 100644 --- a/tests/data/test844 +++ b/tests/data/test844 @@ -25,10 +25,10 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4. imap - + IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test845 b/tests/data/test845 index d622f0cdca..b03cd315cf 100644 --- a/tests/data/test845 +++ b/tests/data/test845 @@ -27,10 +27,10 @@ REPLY AQ== A002 NO Authentication failed imap - + IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test846 b/tests/data/test846 index b04561b898..49c391ffe9 100644 --- a/tests/data/test846 +++ b/tests/data/test846 @@ -29,10 +29,10 @@ body imap - + IMAP PREAUTH response - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u notused:still-provided diff --git a/tests/data/test847 b/tests/data/test847 index 5a68f1c6ef..6972f45fb1 100644 --- a/tests/data/test847 +++ b/tests/data/test847 @@ -27,10 +27,10 @@ body imap - + IMAP FETCH message - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;UID=1' -u '"user:sec"ret{' diff --git a/tests/data/test848 b/tests/data/test848 index 27efe8ae05..a0d5a29e7d 100644 --- a/tests/data/test848 +++ b/tests/data/test848 @@ -33,10 +33,10 @@ body imap - + IMAP plain authentication with alternative authorization identity - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox diff --git a/tests/data/test849 b/tests/data/test849 index 20fca6b943..d0dcb45e4d 100644 --- a/tests/data/test849 +++ b/tests/data/test849 @@ -24,10 +24,10 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= A002 NO Not authorized imap - + IMAP plain authentication with alternative authorization identity (Not authorized) - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel diff --git a/tests/data/test85 b/tests/data/test85 index afddd9ca62..b70dbb8182 100644 --- a/tests/data/test85 +++ b/tests/data/test85 @@ -30,10 +30,10 @@ contents http - + HTTP over proxy with site and proxy authentication - - + + http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user testing:this diff --git a/tests/data/test850 b/tests/data/test850 index 5b6a20f1c5..f0a9f17d65 100644 --- a/tests/data/test850 +++ b/tests/data/test850 @@ -27,10 +27,10 @@ body pop3 - + POP3 RETR message - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test851 b/tests/data/test851 index e47517f36a..3f24c14b34 100644 --- a/tests/data/test851 +++ b/tests/data/test851 @@ -22,10 +22,10 @@ REPLY LIST +OK %TESTNUMBER 100\r\n. pop3 - + POP3 LIST one message - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret diff --git a/tests/data/test852 b/tests/data/test852 index 2234087ee0..ed433862bf 100644 --- a/tests/data/test852 +++ b/tests/data/test852 @@ -22,10 +22,10 @@ REPLY LIST -ERR no such message pop3 - + POP3 LIST invalid message - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret diff --git a/tests/data/test853 b/tests/data/test853 index 468e07848c..de5236420d 100644 --- a/tests/data/test853 +++ b/tests/data/test853 @@ -31,10 +31,10 @@ SLOWDOWN pop3 - + POP3 LIST messages from *SLOW* server - - + + pop3://%HOSTIP:%POP3PORT/ -u user:secret diff --git a/tests/data/test854 b/tests/data/test854 index a8a18b6895..acb32b01f3 100644 --- a/tests/data/test854 +++ b/tests/data/test854 @@ -23,10 +23,10 @@ REPLY LIST +OK but no messages\r\n. pop3 - + POP3 LIST no messages available - - + + pop3://%HOSTIP:%POP3PORT/ -u user:secret diff --git a/tests/data/test855 b/tests/data/test855 index 0ab1ab3971..c7c10be651 100644 --- a/tests/data/test855 +++ b/tests/data/test855 @@ -22,10 +22,10 @@ REPLY RETR -ERR no such message pop3 - + POP3 RETR invalid message - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test856 b/tests/data/test856 index efff9d0aa1..c107612dee 100644 --- a/tests/data/test856 +++ b/tests/data/test856 @@ -21,10 +21,10 @@ REPLY PASS -ERR Login failure pop3 - + POP3 invalid login - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong diff --git a/tests/data/test857 b/tests/data/test857 index 15cc4c8058..5868a2d57f 100644 --- a/tests/data/test857 +++ b/tests/data/test857 @@ -38,10 +38,10 @@ To: fake@nowhere pop3 - + POP3 RETR message with dot-prefixed line - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test858 b/tests/data/test858 index c4af2f7dd7..f119100ecd 100644 --- a/tests/data/test858 +++ b/tests/data/test858 @@ -19,10 +19,10 @@ CUSTOMREQUEST pop3 - + POP3 DELE message (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I diff --git a/tests/data/test859 b/tests/data/test859 index 3d2e1c766b..11ffc068e5 100644 --- a/tests/data/test859 +++ b/tests/data/test859 @@ -19,10 +19,10 @@ CUSTOMREQUEST pop3 - + POP3 STAT (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT -u user:secret -X STAT -I diff --git a/tests/data/test86 b/tests/data/test86 index 62284e942f..ba9c90d7a8 100644 --- a/tests/data/test86 +++ b/tests/data/test86 @@ -53,9 +53,9 @@ crap data http - + HTTP, urlglob []-retrieval and -o #[num] usage - + "http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "%LOGDIR/dumpit#1.dump" diff --git a/tests/data/test860 b/tests/data/test860 index 26809bf346..5e1f3f611b 100644 --- a/tests/data/test860 +++ b/tests/data/test860 @@ -19,10 +19,10 @@ CUSTOMREQUEST pop3 - + POP3 NOOP (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT -u user:secret -X NOOP -I diff --git a/tests/data/test861 b/tests/data/test861 index 4cc3987421..65b44c1cc0 100644 --- a/tests/data/test861 +++ b/tests/data/test861 @@ -30,10 +30,10 @@ CAPA UIDL USER pop3 - + POP3 UIDL (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL diff --git a/tests/data/test862 b/tests/data/test862 index 47b37bba72..ab0feaa483 100644 --- a/tests/data/test862 +++ b/tests/data/test862 @@ -28,10 +28,10 @@ To: fake@nowhere pop3 - + POP3 retrieve message header (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0' diff --git a/tests/data/test863 b/tests/data/test863 index 940045f691..f7b288baa6 100644 --- a/tests/data/test863 +++ b/tests/data/test863 @@ -19,10 +19,10 @@ CUSTOMREQUEST pop3 - + POP3 RSET (CUSTOMREQUEST) - - + + pop3://%HOSTIP:%POP3PORT -u user:secret -X RSET -I diff --git a/tests/data/test864 b/tests/data/test864 index 9f2ba125bf..4f40a52ab0 100644 --- a/tests/data/test864 +++ b/tests/data/test864 @@ -33,10 +33,10 @@ pop3 crypto - + POP3 APOP authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test865 b/tests/data/test865 index 9d931b53a7..59bf1c154b 100644 --- a/tests/data/test865 +++ b/tests/data/test865 @@ -35,10 +35,10 @@ body pop3 - + POP3 plain authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test866 b/tests/data/test866 index 72e5c0339e..adab0d8960 100644 --- a/tests/data/test866 +++ b/tests/data/test866 @@ -35,10 +35,10 @@ body pop3 - + POP3 login authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test867 b/tests/data/test867 index 5d59aa97c5..5be5ad6fb8 100644 --- a/tests/data/test867 +++ b/tests/data/test867 @@ -38,10 +38,10 @@ pop3 crypto - + POP3 CRAM-MD5 authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test869 b/tests/data/test869 index 0613e2f513..59900df087 100644 --- a/tests/data/test869 +++ b/tests/data/test869 @@ -41,10 +41,10 @@ pop3 debug crypto - + POP3 DIGEST-MD5 authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test87 b/tests/data/test87 index 5cf7de5a73..f5d689d45d 100644 --- a/tests/data/test87 +++ b/tests/data/test87 @@ -36,9 +36,9 @@ http http - + urlglob with out of range -o #[num] usage - + "http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "%LOGDIR/dumpit%TESTNUMBER-#2.dump" diff --git a/tests/data/test870 b/tests/data/test870 index 30f3586c84..b1329da9aa 100644 --- a/tests/data/test870 +++ b/tests/data/test870 @@ -35,10 +35,10 @@ body pop3 - + POP3 OAuth 2.0 (XOAUTH2) authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test871 b/tests/data/test871 index 00adefd387..38335177d4 100644 --- a/tests/data/test871 +++ b/tests/data/test871 @@ -35,10 +35,10 @@ body pop3 - + POP3 plain authentication with initial response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir diff --git a/tests/data/test872 b/tests/data/test872 index 19cd49a977..f6c5974262 100644 --- a/tests/data/test872 +++ b/tests/data/test872 @@ -35,10 +35,10 @@ body pop3 - + POP3 login authentication with initial response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir diff --git a/tests/data/test874 b/tests/data/test874 index 1f19c5c0f0..810bc49d17 100644 --- a/tests/data/test874 +++ b/tests/data/test874 @@ -35,10 +35,10 @@ body pop3 - + POP3 OAuth 2.0 (XOAUTH2) authentication with initial response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir diff --git a/tests/data/test875 b/tests/data/test875 index 8850fab050..88dfbc2d09 100644 --- a/tests/data/test875 +++ b/tests/data/test875 @@ -11,10 +11,10 @@ CRLF-in-URL pop3 - + POP3 with URL-encoded CR LF in the URL - - + + pop3://%HOSTIP:%POP3PORT/%0d%0a/%TESTNUMBER diff --git a/tests/data/test876 b/tests/data/test876 index ae5ea07a1f..a34b97a9d3 100644 --- a/tests/data/test876 +++ b/tests/data/test876 @@ -30,10 +30,10 @@ pop3 crypto - + POP3 CRAM-MD5 graceful cancellation - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test877 b/tests/data/test877 index 65070d0998..2502370624 100644 --- a/tests/data/test877 +++ b/tests/data/test877 @@ -32,16 +32,16 @@ NTLM SSL !SSPI - + POP3 NTLM graceful cancellation - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass diff --git a/tests/data/test878 b/tests/data/test878 index 28bd44a7b8..58c2e3007d 100644 --- a/tests/data/test878 +++ b/tests/data/test878 @@ -32,10 +32,10 @@ pop3 debug crypto - + POP3 DIGEST-MD5 graceful cancellation - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test879 b/tests/data/test879 index 1b7ca564b3..c7b99efb89 100644 --- a/tests/data/test879 +++ b/tests/data/test879 @@ -42,10 +42,10 @@ pop3 crypto - + POP3 CRAM-MD5 authentication with SASL downgrade - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test88 b/tests/data/test88 index 1ca5d88775..e3f68c0ee0 100644 --- a/tests/data/test88 +++ b/tests/data/test88 @@ -59,10 +59,10 @@ http !SSPI crypto - + HTTP PUT with Digest authorization - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --digest diff --git a/tests/data/test880 b/tests/data/test880 index 9dc00c0f61..dfa2e688c6 100644 --- a/tests/data/test880 +++ b/tests/data/test880 @@ -44,16 +44,16 @@ NTLM SSL !SSPI - + POP3 NTLM authentication with SASL downgrade - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test881 b/tests/data/test881 index 69e31a4319..7cbdf64ba8 100644 --- a/tests/data/test881 +++ b/tests/data/test881 @@ -44,10 +44,10 @@ pop3 debug crypto - + POP3 DIGEST-MD5 authentication with SASL downgrade - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test882 b/tests/data/test882 index 163d78d7d5..b4fa465340 100644 --- a/tests/data/test882 +++ b/tests/data/test882 @@ -31,10 +31,10 @@ body pop3 - + POP3 multiple connection authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%POP3PORT/%TESTNUMBER002 -u user.two:secret diff --git a/tests/data/test883 b/tests/data/test883 index 6d5900c204..943d278248 100644 --- a/tests/data/test883 +++ b/tests/data/test883 @@ -35,10 +35,10 @@ body pop3 - + POP3 external authentication - - + + 'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' diff --git a/tests/data/test884 b/tests/data/test884 index f0744bf289..611649c2d2 100644 --- a/tests/data/test884 +++ b/tests/data/test884 @@ -35,10 +35,10 @@ body pop3 - + POP3 external authentication without credentials - - + + 'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' diff --git a/tests/data/test885 b/tests/data/test885 index 7131f16b15..6d2383874f 100644 --- a/tests/data/test885 +++ b/tests/data/test885 @@ -35,10 +35,10 @@ body pop3 - + POP3 external authentication with initial response - - + + 'pop3://user;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir diff --git a/tests/data/test886 b/tests/data/test886 index f777abbaef..e926fe21a1 100644 --- a/tests/data/test886 +++ b/tests/data/test886 @@ -35,10 +35,10 @@ body pop3 - + POP3 external authentication with initial response without credentials - - + + 'pop3://;AUTH=EXTERNAL@%HOSTIP:%POP3PORT/%TESTNUMBER' --sasl-ir diff --git a/tests/data/test887 b/tests/data/test887 index 2d0f535df9..ada1ce1a6b 100644 --- a/tests/data/test887 +++ b/tests/data/test887 @@ -36,10 +36,10 @@ body pop3 - + POP3 OAuth 2.0 (OAUTHBEARER) authentication - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test888 b/tests/data/test888 index b35b9d61c9..289f8137e1 100644 --- a/tests/data/test888 +++ b/tests/data/test888 @@ -36,10 +36,10 @@ body pop3 - + POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir diff --git a/tests/data/test889 b/tests/data/test889 index 155268b98a..5abba0e4ed 100644 --- a/tests/data/test889 +++ b/tests/data/test889 @@ -28,10 +28,10 @@ REPLY AQ== -ERR Authentication failed pop3 - + POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM diff --git a/tests/data/test890 b/tests/data/test890 index e625fcac1a..2c396143aa 100644 --- a/tests/data/test890 +++ b/tests/data/test890 @@ -28,10 +28,10 @@ REPLY AQ== -ERR Authentication failed pop3 - + POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir diff --git a/tests/data/test891 b/tests/data/test891 index b2496f8164..f022db96a7 100644 --- a/tests/data/test891 +++ b/tests/data/test891 @@ -23,10 +23,10 @@ pop3 crypto - + POP3 with short authentication response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret diff --git a/tests/data/test892 b/tests/data/test892 index 5a6a7fd7cf..c77b35da8a 100644 --- a/tests/data/test892 +++ b/tests/data/test892 @@ -35,10 +35,10 @@ body pop3 - + POP3 plain authentication with alternative authorization identity - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbox diff --git a/tests/data/test893 b/tests/data/test893 index ca68dd0429..dacd1bc864 100644 --- a/tests/data/test893 +++ b/tests/data/test893 @@ -26,10 +26,10 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= -ERR Not authorized pop3 - + POP3 plain authentication with alternative authorization identity (Not authorized) - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel diff --git a/tests/data/test894 b/tests/data/test894 index f9866580b2..5582066a64 100644 --- a/tests/data/test894 +++ b/tests/data/test894 @@ -18,10 +18,10 @@ RETR pop3 - + POP3 with CR in username - - + + pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/%TESTNUMBER diff --git a/tests/data/test895 b/tests/data/test895 index 520e094104..dbf17fdc40 100644 --- a/tests/data/test895 +++ b/tests/data/test895 @@ -28,10 +28,10 @@ body imap - + IMAP with --login-options 'AUTH=*' - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*' diff --git a/tests/data/test896 b/tests/data/test896 index c972906a45..f9e0ff701b 100644 --- a/tests/data/test896 +++ b/tests/data/test896 @@ -19,10 +19,10 @@ FETCH imap - + IMAP with --login-options 'AUTH=dummy' (failing) - - + + 'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=dummy' diff --git a/tests/data/test897 b/tests/data/test897 index 5c4410cc33..fe7e1e70a0 100644 --- a/tests/data/test897 +++ b/tests/data/test897 @@ -27,10 +27,10 @@ POSTFETCH extra stuff sent in the envelope after the body imap - + IMAP and envelope meta data after body transfer - - + + 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret -D %LOGDIR/head-%TESTNUMBER diff --git a/tests/data/test898 b/tests/data/test898 index 33bcb29126..c6dba52d67 100644 --- a/tests/data/test898 +++ b/tests/data/test898 @@ -63,10 +63,10 @@ proxy http - + HTTP with custom auth and cookies redirected to HTTP on a diff port - - + + -x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -H "Authorization: Basic am9lOnNlY3JldA==" -H "Cookie: userpwd=am9lOnNlY3JldA==" diff --git a/tests/data/test9 b/tests/data/test9 index 29b1d842e2..90b146e75a 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -26,10 +26,10 @@ Mime http - + HTTP RFC1867-type formposting - - + + http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! diff --git a/tests/data/test900 b/tests/data/test900 index a4fc8aa033..371544b765 100644 --- a/tests/data/test900 +++ b/tests/data/test900 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test901 b/tests/data/test901 index 787365bf0f..a97233d871 100644 --- a/tests/data/test901 +++ b/tests/data/test901 @@ -16,9 +16,9 @@ SMTP smtp - + SMTP with CRLF-dot-CRLF in data - + From: different To: another @@ -31,7 +31,7 @@ To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test902 b/tests/data/test902 index 4f651a83b8..961fc7bfbf 100644 --- a/tests/data/test902 +++ b/tests/data/test902 @@ -21,16 +21,16 @@ REPLY EHLO 500 Command unrecognized smtp - + RFC821-only SMTP server (EHLO not supported) - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test903 b/tests/data/test903 index 8fe3174d3d..f4d616ec67 100644 --- a/tests/data/test903 +++ b/tests/data/test903 @@ -25,13 +25,13 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated smtp - + SMTP plain authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test904 b/tests/data/test904 index 07914970dd..b5916ef419 100644 --- a/tests/data/test904 +++ b/tests/data/test904 @@ -25,13 +25,13 @@ REPLY c2VjcmV0 235 Authenticated smtp - + SMTP login authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test905 b/tests/data/test905 index d29e9a8352..de0b08ac3c 100644 --- a/tests/data/test905 +++ b/tests/data/test905 @@ -28,13 +28,13 @@ smtp crypto - + SMTP CRAM-MD5 authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test907 b/tests/data/test907 index 0ce464c694..12d6e82890 100644 --- a/tests/data/test907 +++ b/tests/data/test907 @@ -31,13 +31,13 @@ smtp debug crypto - + SMTP DIGEST-MD5 authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test908 b/tests/data/test908 index b87c4387b7..202977a64a 100644 --- a/tests/data/test908 +++ b/tests/data/test908 @@ -25,13 +25,13 @@ REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB 235 Authenticated smtp - + SMTP OAuth 2.0 (XOAUTH2) authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T - diff --git a/tests/data/test909 b/tests/data/test909 index 6fa4b28d80..e054e49351 100644 --- a/tests/data/test909 +++ b/tests/data/test909 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP without SIZE support - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test91 b/tests/data/test91 index 2fc020128a..37d8e4e36c 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -80,9 +80,9 @@ SSL http - + HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0 - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret diff --git a/tests/data/test910 b/tests/data/test910 index 8787cc0601..521318ace5 100644 --- a/tests/data/test910 +++ b/tests/data/test910 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP without terminating CRLF - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test911 b/tests/data/test911 index 88631cd3d9..b0c5d0eb82 100644 --- a/tests/data/test911 +++ b/tests/data/test911 @@ -16,15 +16,15 @@ SMTP smtp - + SMTP with no mail data - + - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test912 b/tests/data/test912 index dd34a46ea5..4977a4e821 100644 --- a/tests/data/test912 +++ b/tests/data/test912 @@ -20,16 +20,16 @@ CAPA SIZE smtp - + SMTP with SIZE support - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test913 b/tests/data/test913 index 48beac64ce..a0aed0072b 100644 --- a/tests/data/test913 +++ b/tests/data/test913 @@ -20,16 +20,16 @@ CAPA "SIZE 32" smtp - + SMTP with large message SIZE - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test914 b/tests/data/test914 index 1843af9fe4..56ae524b0a 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -19,16 +19,16 @@ REPLY MAIL 501 not fine enough smtp - + SMTP invalid --mail-from - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test915 b/tests/data/test915 index 5d89442217..9211c34079 100644 --- a/tests/data/test915 +++ b/tests/data/test915 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP without --mail-from - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com -T - diff --git a/tests/data/test916 b/tests/data/test916 index 2c375ee2e6..677a647fd3 100644 --- a/tests/data/test916 +++ b/tests/data/test916 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with invalid --mail-rcpt - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@example.com -T - diff --git a/tests/data/test917 b/tests/data/test917 index fcf21ddac4..d53fbd10c3 100644 --- a/tests/data/test917 +++ b/tests/data/test917 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple --mail-rcpt - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-rcpt recipient.three@example.com --mail-rcpt recipient.four@example.com --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test918 b/tests/data/test918 index 817674fb81..c49128fa91 100644 --- a/tests/data/test918 +++ b/tests/data/test918 @@ -16,16 +16,16 @@ SMTP smtp - + SMTP with multiple and invalid --mail-rcpt - + From: different To: another body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt invalid --mail-rcpt recipient.three@example.com --mail-rcpt sTrAnGe --mail-rcpt recipient.five@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test919 b/tests/data/test919 index 8c49abd264..833a67c97b 100644 --- a/tests/data/test919 +++ b/tests/data/test919 @@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated smtp - + SMTP plain authentication with initial response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T - diff --git a/tests/data/test92 b/tests/data/test92 index 1c09e97bfe..f6250d1962 100644 --- a/tests/data/test92 +++ b/tests/data/test92 @@ -44,10 +44,10 @@ Content-Type: image/gif http - + HTTP resume transfer with the whole file already downloaded - - + + http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 diff --git a/tests/data/test920 b/tests/data/test920 index 26255188fe..ac9af7d7bf 100644 --- a/tests/data/test920 +++ b/tests/data/test920 @@ -25,13 +25,13 @@ REPLY c2VjcmV0 235 Authenticated smtp - + SMTP login authentication with initial response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --sasl-ir -T - diff --git a/tests/data/test922 b/tests/data/test922 index 8c16e4311f..554c0965a5 100644 --- a/tests/data/test922 +++ b/tests/data/test922 @@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated smtp - + SMTP OAuth 2.0 (XOAUTH2) authentication with initial response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T - diff --git a/tests/data/test923 b/tests/data/test923 index 68a013839f..19cdd9667e 100644 --- a/tests/data/test923 +++ b/tests/data/test923 @@ -17,10 +17,10 @@ VRFY smtp - + SMTP VRFY - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient diff --git a/tests/data/test924 b/tests/data/test924 index c87b2a9d58..3a37a5e3c8 100644 --- a/tests/data/test924 +++ b/tests/data/test924 @@ -23,10 +23,10 @@ VRFY smtp - + SMTP ambiguous VRFY - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith diff --git a/tests/data/test925 b/tests/data/test925 index 3b1801b0c1..073f1e3a9b 100644 --- a/tests/data/test925 +++ b/tests/data/test925 @@ -20,10 +20,10 @@ VRFY smtp - + SMTP external VRFY - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@example.net diff --git a/tests/data/test926 b/tests/data/test926 index 248cce9a7f..4e9623ceb5 100644 --- a/tests/data/test926 +++ b/tests/data/test926 @@ -20,10 +20,10 @@ REPLY VRFY 550 Unknown user smtp - + SMTP unknown user VRFY - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient diff --git a/tests/data/test927 b/tests/data/test927 index a982d147aa..fb86a19401 100644 --- a/tests/data/test927 +++ b/tests/data/test927 @@ -23,10 +23,10 @@ CUSTOMREQUEST smtp - + SMTP mailing list EXPN (CUSTOMREQUEST) - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN diff --git a/tests/data/test928 b/tests/data/test928 index 3ed097957f..4c5ab9eafb 100644 --- a/tests/data/test928 +++ b/tests/data/test928 @@ -21,10 +21,10 @@ HELP smtp - + SMTP HELP - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER diff --git a/tests/data/test929 b/tests/data/test929 index be2632829a..1274921f9b 100644 --- a/tests/data/test929 +++ b/tests/data/test929 @@ -18,10 +18,10 @@ CUSTOMREQUEST smtp - + SMTP NOOP (CUSTOMREQUEST) - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I diff --git a/tests/data/test93 b/tests/data/test93 index e0266e68c8..83d2b61022 100644 --- a/tests/data/test93 +++ b/tests/data/test93 @@ -25,10 +25,10 @@ bing http - + HTTP GET with failed proxy auth - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT diff --git a/tests/data/test930 b/tests/data/test930 index ebde938c54..94a9257761 100644 --- a/tests/data/test930 +++ b/tests/data/test930 @@ -18,10 +18,10 @@ CUSTOMREQUEST smtp - + SMTP RSET (CUSTOMREQUEST) - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I diff --git a/tests/data/test931 b/tests/data/test931 index 226f2dd2d3..2b6a686c51 100644 --- a/tests/data/test931 +++ b/tests/data/test931 @@ -11,10 +11,10 @@ CRLF-in-URL smtp - + SMTP with URL-encoded CR LF in the URL - - + + smtp://%HOSTIP:%SMTPPORT/%0d%0a/%TESTNUMBER diff --git a/tests/data/test932 b/tests/data/test932 index b6f828cfb6..e814cc0f72 100644 --- a/tests/data/test932 +++ b/tests/data/test932 @@ -29,10 +29,10 @@ smtp crypto - + SMTP CRAM-MD5 graceful cancellation - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test933 b/tests/data/test933 index 518a9b157b..71f3893005 100644 --- a/tests/data/test933 +++ b/tests/data/test933 @@ -31,16 +31,16 @@ NTLM SSL !SSPI - + SMTP NTLM graceful cancellation - + # we force our own host name, in order to make the test machine independent CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u testuser:testpass -T - diff --git a/tests/data/test934 b/tests/data/test934 index 87b8571d76..8fd444e910 100644 --- a/tests/data/test934 +++ b/tests/data/test934 @@ -31,10 +31,10 @@ smtp debug crypto - + SMTP DIGEST-MD5 graceful cancellation - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test935 b/tests/data/test935 index fe106f8bda..bbd4d94757 100644 --- a/tests/data/test935 +++ b/tests/data/test935 @@ -32,13 +32,13 @@ smtp crypto - + SMTP CRAM-MD5 authentication with SASL downgrade - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test936 b/tests/data/test936 index 6d8074f2e9..f57f63ec86 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -34,9 +34,9 @@ NTLM SSL !SSPI - + SMTP NTLM authentication with SASL downgrade - + mail body @@ -46,7 +46,7 @@ CURL_GETHOSTNAME=curlhost # we try to use the LD_PRELOAD hack, if not a debug build LD_PRELOAD=%PWD/libtest/.libs/libhostname.so - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test937 b/tests/data/test937 index c2a195ab19..6c361b7387 100644 --- a/tests/data/test937 +++ b/tests/data/test937 @@ -34,13 +34,13 @@ smtp debug crypto - + SMTP DIGEST-MD5 authentication with SASL downgrade - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test938 b/tests/data/test938 index be90db3046..475572b070 100644 --- a/tests/data/test938 +++ b/tests/data/test938 @@ -27,13 +27,13 @@ REPLY dXNlci50d28AdXNlci50d28Ac2VjcmV0 235 Authenticated smtp - + SMTP multiple connection authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T %LOGDIR/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test939 b/tests/data/test939 index b385798b68..e1424d2ddb 100644 --- a/tests/data/test939 +++ b/tests/data/test939 @@ -20,13 +20,13 @@ REPLY EHLO 500 Command unrecognized smtp - + RFC821-only SMTP with username and password - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test94 b/tests/data/test94 index 87b65d13a8..eb745d1df4 100644 --- a/tests/data/test94 +++ b/tests/data/test94 @@ -31,10 +31,10 @@ http SSL proxy - + HTTPS GET with failed proxy auth (CONNECT 1.0) - - + + https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT diff --git a/tests/data/test940 b/tests/data/test940 index baa0c98944..afc9da0c93 100644 --- a/tests/data/test940 +++ b/tests/data/test940 @@ -16,13 +16,13 @@ SMTP smtp - + SMTP with username and password but no AUTH capability - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret -T - diff --git a/tests/data/test941 b/tests/data/test941 index a983837516..7c87f50280 100644 --- a/tests/data/test941 +++ b/tests/data/test941 @@ -17,9 +17,9 @@ SMTP smtp - + SMTP with --crlf - + From: different To: another @@ -33,7 +33,7 @@ with the --crlf option - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/upload%TESTNUMBER --crlf diff --git a/tests/data/test942 b/tests/data/test942 index ae30a9c6e6..2286c20e6f 100644 --- a/tests/data/test942 +++ b/tests/data/test942 @@ -25,13 +25,13 @@ REPLY dXNlcg== 235 Authenticated smtp - + SMTP external authentication - + mail body - + 'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test943 b/tests/data/test943 index 4f403cdff0..80e935fede 100644 --- a/tests/data/test943 +++ b/tests/data/test943 @@ -25,13 +25,13 @@ REPLY = 235 Authenticated smtp - + SMTP external authentication without credentials - + mail body - + 'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com -T - diff --git a/tests/data/test944 b/tests/data/test944 index 0539a8ae13..0dfaefb716 100644 --- a/tests/data/test944 +++ b/tests/data/test944 @@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated smtp - + SMTP external authentication with initial response - + mail body - + 'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T - diff --git a/tests/data/test945 b/tests/data/test945 index 5a3fb49376..5b64127644 100644 --- a/tests/data/test945 +++ b/tests/data/test945 @@ -25,13 +25,13 @@ REPLY AUTH 235 Authenticated smtp - + SMTP external authentication with initial response without credentials - + mail body - + 'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt recipient@example.com --mail-from sender@example.com --sasl-ir -T - diff --git a/tests/data/test946 b/tests/data/test946 index ea6569380d..b306180aaa 100644 --- a/tests/data/test946 +++ b/tests/data/test946 @@ -26,13 +26,13 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4. smtp - + SMTP OAuth 2.0 (OAUTHBEARER) authentication - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T - diff --git a/tests/data/test947 b/tests/data/test947 index 290da7114b..5ca2be6714 100644 --- a/tests/data/test947 +++ b/tests/data/test947 @@ -26,13 +26,13 @@ REPLY AUTH 235 Authenticated smtp - + SMTP OAuth 2.0 (OAUTHBEARER) authentication with initial response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T - diff --git a/tests/data/test948 b/tests/data/test948 index 59a492f179..a765fba3d9 100644 --- a/tests/data/test948 +++ b/tests/data/test948 @@ -27,13 +27,13 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s smtp - + SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T - diff --git a/tests/data/test949 b/tests/data/test949 index 0c90074956..136baf4efa 100644 --- a/tests/data/test949 +++ b/tests/data/test949 @@ -27,13 +27,13 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s smtp - + SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T - diff --git a/tests/data/test95 b/tests/data/test95 index bc82f162f7..339c02ae4b 100644 --- a/tests/data/test95 +++ b/tests/data/test95 @@ -46,10 +46,10 @@ contents http http-proxy - + HTTP over proxytunnel using POST - - + + http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -d "datatopost=ohthatsfunyesyes" diff --git a/tests/data/test950 b/tests/data/test950 index 3198ab214b..6628f00434 100644 --- a/tests/data/test950 +++ b/tests/data/test950 @@ -21,9 +21,9 @@ VRFY smtp - + SMTP VRFY with custom request - + # the custom request just does it lowercase to remain the same command diff --git a/tests/data/test951 b/tests/data/test951 index 3a3626f7ee..2b93150471 100644 --- a/tests/data/test951 +++ b/tests/data/test951 @@ -16,9 +16,9 @@ SMTP smtp - + SMTP data with dot as first character - + .This first line starts with a dot diff --git a/tests/data/test952 b/tests/data/test952 index 39b9f76084..716310df65 100644 --- a/tests/data/test952 +++ b/tests/data/test952 @@ -16,9 +16,9 @@ SMTP smtp - + SMTP data with single dot-only line - + . diff --git a/tests/data/test953 b/tests/data/test953 index e4d0328a6f..f293f896e8 100644 --- a/tests/data/test953 +++ b/tests/data/test953 @@ -25,13 +25,13 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 235 Authenticated smtp - + SMTP plain authentication with alternative authorization identity - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - diff --git a/tests/data/test954 b/tests/data/test954 index fa2d591851..698786b4db 100644 --- a/tests/data/test954 +++ b/tests/data/test954 @@ -25,13 +25,13 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 501 Not authorized smtp - + SMTP plain authentication with alternative authorization identity (Not authorized) - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - diff --git a/tests/data/test955 b/tests/data/test955 index 6525baab39..24cc2b7e43 100644 --- a/tests/data/test955 +++ b/tests/data/test955 @@ -29,9 +29,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support - UTF-8 based sender (local part only) - + From: different To: another diff --git a/tests/data/test956 b/tests/data/test956 index 52d2454a25..1180523bbd 100644 --- a/tests/data/test956 +++ b/tests/data/test956 @@ -26,9 +26,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only) - + From: different To: another diff --git a/tests/data/test957 b/tests/data/test957 index 097385fe2a..1b01b7e53a 100644 --- a/tests/data/test957 +++ b/tests/data/test957 @@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only) - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren diff --git a/tests/data/test958 b/tests/data/test958 index 1df1580840..3ad77fe103 100644 --- a/tests/data/test958 +++ b/tests/data/test958 @@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only) - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@example.com diff --git a/tests/data/test959 b/tests/data/test959 index 8bebe40ad2..143708df8c 100644 --- a/tests/data/test959 +++ b/tests/data/test959 @@ -30,9 +30,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support - UTF-8 based sender (host part only) - + From: different To: another diff --git a/tests/data/test960 b/tests/data/test960 index 68d8eda724..bcb9bf44c5 100644 --- a/tests/data/test960 +++ b/tests/data/test960 @@ -27,9 +27,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only) - + From: different To: another diff --git a/tests/data/test961 b/tests/data/test961 index 9cd10f5745..750943ab47 100644 --- a/tests/data/test961 +++ b/tests/data/test961 @@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only) - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se diff --git a/tests/data/test962 b/tests/data/test962 index 0977ab326c..503761b46f 100644 --- a/tests/data/test962 +++ b/tests/data/test962 @@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support - UTF-8 based sender (host part only) - + From: different To: another diff --git a/tests/data/test963 b/tests/data/test963 index 4ddc871622..1b977f0070 100644 --- a/tests/data/test963 +++ b/tests/data/test963 @@ -28,9 +28,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only) - + From: different To: another diff --git a/tests/data/test964 b/tests/data/test964 index 7901e0aebf..e2d69881ae 100644 --- a/tests/data/test964 +++ b/tests/data/test964 @@ -29,9 +29,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only) - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se diff --git a/tests/data/test965 b/tests/data/test965 index ada2d8e703..71adef8f67 100644 --- a/tests/data/test965 +++ b/tests/data/test965 @@ -31,9 +31,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP with SMTPUTF8 support - UTF-8 based sender - + From: different To: another diff --git a/tests/data/test966 b/tests/data/test966 index d2eb7c17c3..acc248a573 100644 --- a/tests/data/test966 +++ b/tests/data/test966 @@ -31,9 +31,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP with SMTPUTF8 support - UTF-8 based recipient - + From: different To: another diff --git a/tests/data/test967 b/tests/data/test967 index 87a37ae05d..95fb153bdc 100644 --- a/tests/data/test967 +++ b/tests/data/test967 @@ -35,9 +35,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP external VRFY with SMTPUTF8 support - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@åäö.se diff --git a/tests/data/test968 b/tests/data/test968 index 89b543ae45..099f6fd290 100644 --- a/tests/data/test968 +++ b/tests/data/test968 @@ -32,9 +32,9 @@ LC_CTYPE=en_US.UTF-8 perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");' - + SMTP VRFY with SMTPUTF8 support - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren diff --git a/tests/data/test969 b/tests/data/test969 index 860c9d47b4..bb4cc316ea 100644 --- a/tests/data/test969 +++ b/tests/data/test969 @@ -31,10 +31,10 @@ smtp idn !win32 - + SMTP mailing list EXPN (CUSTOMREQUEST) with SMTPUTF8 support - - + + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN diff --git a/tests/data/test97 b/tests/data/test97 index db36eeb701..cc0cf676be 100644 --- a/tests/data/test97 +++ b/tests/data/test97 @@ -25,10 +25,10 @@ blaha http - + HTTP POST with custom content-type - - + + -d "hejsanallabarn" -H "Content-Type: silly/type" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test971 b/tests/data/test971 index dada920018..19260dfdfe 100644 --- a/tests/data/test971 +++ b/tests/data/test971 @@ -13,9 +13,9 @@ options-in-versions none - + Verify that options-in-versions and docs/cmdline-opts are in sync - + %SRCDIR/options-scan.pl %SRCDIR/../docs/options-in-versions %SRCDIR/../docs/cmdline-opts diff --git a/tests/data/test973 b/tests/data/test973 index 6ced107896..17748ea735 100644 --- a/tests/data/test973 +++ b/tests/data/test973 @@ -55,10 +55,10 @@ works http ftp - + HTTP with auth redirected to FTP w/o auth - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret diff --git a/tests/data/test974 b/tests/data/test974 index 5a834ac25f..1e7919c143 100644 --- a/tests/data/test974 +++ b/tests/data/test974 @@ -61,10 +61,10 @@ proxy http - + HTTP with auth redirected to HTTP on a diff port w/o auth - - + + -x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -u joe:secret diff --git a/tests/data/test975 b/tests/data/test975 index 85e03e4f2c..33f2559c6f 100644 --- a/tests/data/test975 +++ b/tests/data/test975 @@ -55,10 +55,10 @@ works http ftp - + HTTP with auth redirected to FTP allowing auth to continue - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret diff --git a/tests/data/test976 b/tests/data/test976 index b2d9488306..35c8901454 100644 --- a/tests/data/test976 +++ b/tests/data/test976 @@ -61,10 +61,10 @@ proxy http - + HTTP with auth redirected to HTTP on a diff port --location-trusted - - + + -x http://%HOSTIP:%HTTPPORT http://firsthost.com --location-trusted -u joe:secret diff --git a/tests/data/test977 b/tests/data/test977 index 145a81ba34..4f52850a0e 100644 --- a/tests/data/test977 +++ b/tests/data/test977 @@ -33,10 +33,10 @@ proxy http - + URL with trailing dot and receiving a cookie for the TLD with dot - - + + -x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c %LOGDIR/cookies%TESTNUMBER diff --git a/tests/data/test978 b/tests/data/test978 index 16e55920d6..810ffbb04e 100644 --- a/tests/data/test978 +++ b/tests/data/test978 @@ -31,10 +31,10 @@ Funny-head: yesyes http - + verify that --stderr works for -w's stderr as well - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stderr}nonsense\n' diff --git a/tests/data/test98 b/tests/data/test98 index 1d89c34fe9..ced184b390 100644 --- a/tests/data/test98 +++ b/tests/data/test98 @@ -25,10 +25,10 @@ blaha http - + HTTP PUT from stdin with set size, disabling chunked transfer-encoding - - + + -T - -H "Transfer-Encoding:" -H "Content-Length: 14" http://%HOSTIP:%HTTPPORT/%TESTNUMBER diff --git a/tests/data/test980 b/tests/data/test980 index 97567f8563..5811b437d4 100644 --- a/tests/data/test980 +++ b/tests/data/test980 @@ -26,13 +26,13 @@ SSL smtp - + SMTP STARTTLS pipelined server response - + mail body - + smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -u user:secret --ssl --sasl-ir -T - diff --git a/tests/data/test981 b/tests/data/test981 index e7941af532..02a03fd2f9 100644 --- a/tests/data/test981 +++ b/tests/data/test981 @@ -25,10 +25,10 @@ SSL imap - + IMAP STARTTLS pipelined server response - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl diff --git a/tests/data/test982 b/tests/data/test982 index 9e07cc0b3f..2f5eccc0a4 100644 --- a/tests/data/test982 +++ b/tests/data/test982 @@ -34,10 +34,10 @@ SSL pop3 - + POP3 STARTTLS pipelined server response - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl diff --git a/tests/data/test983 b/tests/data/test983 index 203e40a3a7..a4294495d0 100644 --- a/tests/data/test983 +++ b/tests/data/test983 @@ -23,9 +23,9 @@ SSL ftp - + FTP STARTTLS pipelined server response - + data to @@ -34,7 +34,7 @@ that FTPS works so does it? - + --ssl --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret -P %CLIENTIP diff --git a/tests/data/test984 b/tests/data/test984 index 7887b776c3..314a24e6cb 100644 --- a/tests/data/test984 +++ b/tests/data/test984 @@ -23,10 +23,10 @@ SSL imap - + IMAP require STARTTLS with failing capabilities - - + + imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl-reqd diff --git a/tests/data/test985 b/tests/data/test985 index d0db4aadf5..0b3cd29ff1 100644 --- a/tests/data/test985 +++ b/tests/data/test985 @@ -32,10 +32,10 @@ SSL pop3 - + POP3 require STARTTLS with failing capabilities - - + + pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl-reqd diff --git a/tests/data/test986 b/tests/data/test986 index ebe12c2914..0ed30452af 100644 --- a/tests/data/test986 +++ b/tests/data/test986 @@ -23,9 +23,9 @@ SSL ftp - + FTP require STARTTLS while preauthenticated - + data to @@ -34,7 +34,7 @@ that FTPS works so does it? - + --ssl-reqd --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret diff --git a/tests/data/test987 b/tests/data/test987 index 9176748e1e..bf926b7fe2 100644 --- a/tests/data/test987 +++ b/tests/data/test987 @@ -16,16 +16,16 @@ SMTPS smtps - + SMTPS with redundant explicit SSL request - + From: different To: another body - + -k --ssl-reqd --mail-rcpt recipient@example.com --mail-from sender@example.com -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER diff --git a/tests/data/test988 b/tests/data/test988 index 71c873c8b9..31e1c8711b 100644 --- a/tests/data/test988 +++ b/tests/data/test988 @@ -26,10 +26,10 @@ body imaps - + IMAPS FETCH with redundant explicit SSL request - - + + -k --ssl-reqd -u '"user:sec"ret{' 'imaps://%HOSTIP:%IMAPSPORT/%TESTNUMBER/;MAILINDEX=1' diff --git a/tests/data/test989 b/tests/data/test989 index 2fee9f8954..fa41240a20 100644 --- a/tests/data/test989 +++ b/tests/data/test989 @@ -26,10 +26,10 @@ body pop3s - + POP3S RETR with redundant explicit SSL request - - + + -k --ssl-reqd -u user:secret pop3s://%HOSTIP:%POP3SPORT/%TESTNUMBER diff --git a/tests/data/test99 b/tests/data/test99 index 1ed74b0ba7..db11a059b1 100644 --- a/tests/data/test99 +++ b/tests/data/test99 @@ -40,10 +40,10 @@ large_file http - + HTTP GET with large-file resume point and failed resume - - + + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999 diff --git a/tests/data/test990 b/tests/data/test990 index 1b22d1aa92..5ddb57f3dd 100644 --- a/tests/data/test990 +++ b/tests/data/test990 @@ -35,7 +35,7 @@ http use -w %output{} - + http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{%LOGDIR/output}%{http_code}\n'