From ca2a80266834bba8f490fd9ac51f77d1b8606d93 Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Fri, 10 Jul 2020 20:17:42 -0700 Subject: Upgrade curl to curl-7_71_1 Change-Id: Ief1f908509a0dd7944004e102310c255e42e4803 --- tests/data/Makefile.inc | 36 ++++++++++------- tests/data/test1034 | 2 +- tests/data/test1035 | 2 +- tests/data/test1084 | 2 +- tests/data/test1085 | 2 +- tests/data/test1097 | 1 + tests/data/test1168 | 78 +++++++++++++++++++++++++++++++++++ tests/data/test1177 | 2 +- tests/data/test1178 | 55 +++++++++++++++++++++++++ tests/data/test1179 | 43 ++++++++++++++++++++ tests/data/test1234 | 2 +- tests/data/test1236 | 2 +- tests/data/test1238 | 8 ++++ tests/data/test1244 | 9 +++-- tests/data/test1248 | 2 +- tests/data/test1249 | 2 +- tests/data/test1260 | 2 +- tests/data/test1263 | 2 +- tests/data/test1269 | 2 +- tests/data/test1296 | 56 ++++++++++++++++++++++++++ tests/data/test1340 | 4 +- tests/data/test1341 | 4 +- tests/data/test1409 | 2 +- tests/data/test1410 | 2 +- tests/data/test1427 | 2 +- tests/data/test1446 | 2 +- tests/data/test1447 | 2 +- tests/data/test1453 | 2 +- tests/data/test1460 | 62 ++++++++++++++++++++++++++++ tests/data/test1508 | 2 +- tests/data/test1539 | 43 ++++++++++++++++++++ tests/data/test1550 | 4 +- tests/data/test1554 | 14 +++++++ tests/data/test1630 | 56 ++++++++++++++++++++++++++ tests/data/test1631 | 87 +++++++++++++++++++++++++++++++++++++++ tests/data/test1632 | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1633 | 97 ++++++++++++++++++++++++++++++++++++++++++++ tests/data/test1901 | 4 +- tests/data/test1909 | 65 ++++++++++++++++++++++++++++++ tests/data/test1910 | 68 +++++++++++++++++++++++++++++++ tests/data/test2004 | 2 +- tests/data/test2036 | 2 +- tests/data/test2047 | 1 + tests/data/test219 | 2 +- tests/data/test288 | 2 +- tests/data/test302 | 1 + tests/data/test333 | 2 +- tests/data/test346 | 60 +++++++++++++++++++++++++++ tests/data/test501 | 2 +- tests/data/test504 | 2 +- tests/data/test509 | 5 +-- tests/data/test543 | 2 + tests/data/test552 | Bin 142941 -> 142947 bytes tests/data/test558 | 1 - tests/data/test582 | 2 +- tests/data/test583 | 2 +- tests/data/test600 | 2 +- tests/data/test601 | 2 +- tests/data/test602 | 2 +- tests/data/test603 | 2 +- tests/data/test604 | 2 +- tests/data/test605 | 2 +- tests/data/test606 | 2 +- tests/data/test607 | 2 +- tests/data/test608 | 2 +- tests/data/test609 | 2 +- tests/data/test610 | 2 +- tests/data/test611 | 2 +- tests/data/test612 | 2 +- tests/data/test613 | 4 +- tests/data/test614 | 4 +- tests/data/test615 | 2 +- tests/data/test616 | 2 +- tests/data/test617 | 2 +- tests/data/test618 | 2 +- tests/data/test619 | 2 +- tests/data/test620 | 2 +- tests/data/test621 | 2 +- tests/data/test622 | 2 +- tests/data/test623 | 2 +- tests/data/test624 | 2 +- tests/data/test625 | 2 +- tests/data/test626 | 2 +- tests/data/test628 | 2 +- tests/data/test629 | 2 +- tests/data/test630 | 2 +- tests/data/test631 | 2 +- tests/data/test632 | 2 +- tests/data/test633 | 2 +- tests/data/test634 | 2 +- tests/data/test635 | 2 +- tests/data/test636 | 2 +- tests/data/test637 | 2 +- tests/data/test638 | 2 +- tests/data/test639 | 2 +- tests/data/test640 | 2 +- tests/data/test641 | 2 +- tests/data/test642 | 2 +- tests/data/test656 | 2 +- tests/data/test664 | 2 +- tests/data/test665 | 2 +- tests/data/test75 | 5 --- tests/data/test76 | 2 +- tests/data/test895 | 50 +++++++++++++++++++++++ tests/data/test896 | 38 ++++++++++++++++++ tests/data/test970 | 1 + tests/data/test971 | 25 ++++++++++++ 107 files changed, 1126 insertions(+), 114 deletions(-) create mode 100644 tests/data/test1168 create mode 100644 tests/data/test1178 create mode 100644 tests/data/test1179 create mode 100644 tests/data/test1296 create mode 100644 tests/data/test1460 create mode 100644 tests/data/test1539 create mode 100644 tests/data/test1630 create mode 100644 tests/data/test1631 create mode 100644 tests/data/test1632 create mode 100644 tests/data/test1633 create mode 100644 tests/data/test1909 create mode 100644 tests/data/test1910 create mode 100644 tests/data/test346 create mode 100644 tests/data/test895 create mode 100644 tests/data/test896 create mode 100644 tests/data/test971 (limited to 'tests/data') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 26faa954..ef9252b7 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -58,7 +58,7 @@ test307 test308 test309 test310 test311 test312 test313 test314 test315 \ test316 test317 test318 test319 test320 test321 test322 test323 test324 \ test325 test326 test327 test328 test329 test330 test331 test332 test333 \ test334 test335 test336 test337 test338 test339 test340 test341 test342 \ -test343 test344 test345 \ +test343 test344 test345 test346 \ test350 test351 test352 test353 test354 test355 test356 test357 test358 \ test359 \ test393 test394 test395 \ @@ -99,12 +99,12 @@ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ test818 test819 test820 test821 test822 test823 test824 test825 test826 \ test827 test828 test829 test830 test831 test832 test833 test834 test835 \ test836 test837 test838 test839 test840 test841 test842 test843 test844 \ -test845 test846 test847 test848 test849 \ -test850 test851 test852 test853 test854 test855 test856 test857 test858 \ -test859 test860 test861 test862 test863 test864 test865 test866 test867 \ -test868 test869 test870 test871 test872 test873 test874 test875 test876 \ -test877 test878 test879 test880 test881 test882 test883 test884 test885 \ -test886 test887 test888 test889 test890 test891 test892 test893 test894 \ +test845 test846 test847 test848 test849 test850 test851 test852 test853 \ +test854 test855 test856 test857 test858 test859 test860 test861 test862 \ +test863 test864 test865 test866 test867 test868 test869 test870 test871 \ +test872 test873 test874 test875 test876 test877 test878 test879 test880 \ +test881 test882 test883 test884 test885 test886 test887 test888 test889 \ +test890 test891 test892 test893 test894 test895 test896 \ \ test900 test901 test902 test903 test904 test905 test906 test907 test908 \ test909 test910 test911 test912 test913 test914 test915 test916 test917 \ @@ -113,7 +113,7 @@ test927 test928 test929 test930 test931 test932 test933 test934 test935 \ test936 test937 test938 test939 test940 test941 test942 test943 test944 \ test945 test946 test947 test948 test949 test950 test951 test952 test953 \ test954 test955 test956 test957 test958 test959 test960 test961 test962 \ -test963 test964 test965 test966 test967 test968 test969 test970 \ +test963 test964 test965 test966 test967 test968 test969 test970 test971 \ \ test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \ test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \ @@ -136,8 +136,10 @@ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ test1160 test1161 test1162 test1163 test1164 test1165 test1166 test1167 \ +test1168 \ \ test1170 test1171 test1172 test1173 test1174 test1175 test1176 test1177 \ +test1178 test1179 \ \ test1190 test1191 test1192 test1193 test1194 test1195 test1196 \ \ @@ -154,6 +156,7 @@ test1268 test1269 test1270 test1271 \ \ test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ test1288 test1289 test1290 test1291 test1292 test1293 test1294 test1295 \ +test1296 \ \ test1298 test1299 test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ @@ -175,14 +178,15 @@ test1426 test1427 test1428 test1429 test1430 test1431 test1432 test1433 \ test1434 test1435 test1436 test1437 test1438 test1439 test1440 test1441 \ test1442 test1443 test1444 test1445 test1446 test1447 test1448 test1449 \ test1450 test1451 test1452 test1453 test1454 test1455 test1456 test1457 \ -test1458 test1459 test1500 test1501 test1502 test1503 test1504 test1505 \ -test1506 test1507 test1508 test1509 test1510 test1511 test1512 test1513 \ -test1514 test1515 test1516 test1517 test1518 test1519 test1520 test1521 \ -test1522 test1523 test1524 \ +test1458 test1459 test1460 \ \ -test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \ -test1533 test1534 test1535 test1536 test1537 test1538 \ +test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ +test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ +test1516 test1517 test1518 test1519 test1520 test1521 test1522 test1523 \ +test1524 test1525 test1526 test1527 test1528 test1529 test1530 test1531 \ +test1532 test1533 test1534 test1535 test1536 test1537 test1538 test1539 \ test1540 test1541 \ +\ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \ test1558 test1559 test1560 test1561 test1562 test1563 test1564 test1565 \ test1566 \ @@ -194,6 +198,8 @@ test1608 test1609 test1610 test1611 test1612 \ \ test1620 test1621 \ \ +test1630 test1631 test1632 test1633 \ +\ test1650 test1651 test1652 test1653 test1654 test1655 \ \ test1700 test1701 test1702 \ @@ -201,7 +207,7 @@ test1700 test1701 test1702 \ test1800 test1801 \ \ test1900 test1901 test1902 test1903 test1904 test1905 test1906 test1907 \ -test1908 \ +test1908 test1909 test1910 \ \ test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \ test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \ diff --git a/tests/data/test1034 b/tests/data/test1034 index b4ffc8a9..89083a29 100644 --- a/tests/data/test1034 +++ b/tests/data/test1034 @@ -43,7 +43,7 @@ HTTP over proxy with malformatted IDN host name url = "http://invalid-utf8-�.local/page/1034" --K - -x %HOSTIP:%HTTPPORT +-K - -x %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1035 b/tests/data/test1035 index a316c51e..62f9d7ae 100644 --- a/tests/data/test1035 +++ b/tests/data/test1035 @@ -35,7 +35,7 @@ perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(lan 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/1035 -x %HOSTIP:%HTTPPORT +http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1084 b/tests/data/test1084 index 1cfab68d..db6ab5e9 100644 --- a/tests/data/test1084 +++ b/tests/data/test1084 @@ -27,7 +27,7 @@ none HTTP GET with invalid --interface -http://%HOSTIP:%HTTPPORT/1084 --interface non-existing-host.haxx.se. +http://%HOSTIP:%NOLISTENPORT/1084 --interface non-existing-host.haxx.se. diff --git a/tests/data/test1085 b/tests/data/test1085 index db02e603..ac1f0629 100644 --- a/tests/data/test1085 +++ b/tests/data/test1085 @@ -29,7 +29,7 @@ none HTTP-IPv6 GET with invalid --interface --g "http://%HOST6IP:%HTTP6PORT/1085" --interface non-existing-host.haxx.se. +-g "http://%HOST6IP:%NOLISTENPORT/1085" --interface non-existing-host.haxx.se. # Ensure the IPv6 stack is operational before running this test (other tests # use the startup of the IPv6 test server as a substitute check for this). diff --git a/tests/data/test1097 b/tests/data/test1097 index 70a89908..82f23846 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -47,6 +47,7 @@ https NTLM SSL !SSPI +proxy HTTP POST using CONNECT with --proxy-ntlm but no auth is required diff --git a/tests/data/test1168 b/tests/data/test1168 new file mode 100644 index 00000000..283e91e0 --- /dev/null +++ b/tests/data/test1168 @@ -0,0 +1,78 @@ + + + +HTTP +HTTP GET +followlocation + + +# Server-side + + +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: /data/11680002.txt +Connection: close + +This server reply is for testing a simple Location: following + + + +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + + + +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: /data/11680002.txt +Connection: close + +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + + + + +# Client-side + + +http + + +HTTP redirect with credentials using # in user and password + + +http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY" + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /want/1168 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +Accept: */* + +GET /data/11680002.txt HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +Accept: */* + + + + diff --git a/tests/data/test1177 b/tests/data/test1177 index 75a1ab35..85b520ce 100644 --- a/tests/data/test1177 +++ b/tests/data/test1177 @@ -18,7 +18,7 @@ Verify that CURL_VERSION_* in headers and docs are in sync -%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 ../include/curl/curl.h +%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h diff --git a/tests/data/test1178 b/tests/data/test1178 new file mode 100644 index 00000000..6d1264c3 --- /dev/null +++ b/tests/data/test1178 @@ -0,0 +1,55 @@ + + + +HTTP +HTTP GET +HTTP proxy + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake swsclose +Content-Type: text/html +Funny-head: yesyes + + + + +# +# Client-side + + +http + + +HTTP proxy auth with credentials longer than 256 bytes + +# 400 x 'A' : 600 x 'B' ... + +http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 -x http://%HOSTIP:%HTTPPORT -U AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + + +proxy + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI= +Accept: */* +Proxy-Connection: Keep-Alive + + + + diff --git a/tests/data/test1179 b/tests/data/test1179 new file mode 100644 index 00000000..206ee7ca --- /dev/null +++ b/tests/data/test1179 @@ -0,0 +1,43 @@ + + + +cmdline +wrong option + + + +# +# Server-side + + + +# +# Client-side + + +none + +# make this test require manual as the error message is different without it + +manual + + +error when using unknown command line option + + +--never-implemented http://never.use.this.example.com/1179 + + + +# +# Verify data after the test has been "shot" + + +2 + + +curl: option --never-implemented: is unknown +curl: try 'curl --help' or 'curl --manual' for more information + + + diff --git a/tests/data/test1234 b/tests/data/test1234 index 41c4bc06..577ba51a 100644 --- a/tests/data/test1234 +++ b/tests/data/test1234 @@ -19,7 +19,7 @@ none abusing {}-globbing -"%HOSTIP:%HTTPPORT/1234[0-1]{" "%HOSTIP:%HTTPPORT/{}{}{}{" +"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/{}{}{}{" diff --git a/tests/data/test1236 b/tests/data/test1236 index 0829be31..7408a7ba 100644 --- a/tests/data/test1236 +++ b/tests/data/test1236 @@ -19,7 +19,7 @@ none # 2^62 == 4611686018427387904 -"%HOSTIP:%HTTPPORT/1234[0-1]{" "%HOSTIP:%HTTPPORT/[1-4611686018427387904][1-4611686018427387904]" +"%HOSTIP:%NOLISTENPORT/1234[0-1]{" "%HOSTIP:%NOLISTENPORT/[1-4611686018427387904][1-4611686018427387904]" diff --git a/tests/data/test1238 b/tests/data/test1238 index a0eef417..88c9a5b3 100644 --- a/tests/data/test1238 +++ b/tests/data/test1238 @@ -24,6 +24,14 @@ writedelay: 2 tftp +# Always kill the TFTP server to not affect following tests, due +# to this test potentially keeping the TFTP server busy waiting +# for another 5 seconds after this test has already terminated. +# On some platforms and CI not enough time passes between this +# test and the next tests 1242 and 1243, causing them to fail. + +tftp + slow TFTP retrieve cancel due to -Y and -y diff --git a/tests/data/test1244 b/tests/data/test1244 index d0769ad8..0912c094 100644 --- a/tests/data/test1244 +++ b/tests/data/test1244 @@ -32,10 +32,13 @@ wrong http https - + +proxy + + HTTP GET same URL - different proxy ports - - + + http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPORT/124400001 -x %HOSTIP:%HTTPSPORT diff --git a/tests/data/test1248 b/tests/data/test1248 index 28e7a852..02dacfc8 100644 --- a/tests/data/test1248 +++ b/tests/data/test1248 @@ -29,7 +29,7 @@ http Access a non-proxied host with using the combination of --proxy option and --noproxy option -http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%PROXYPORT/ --noproxy %HOSTIP --max-time 5 +http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%NOLISTENPORT/ --noproxy %HOSTIP --max-time 5 diff --git a/tests/data/test1249 b/tests/data/test1249 index ab561406..1bc3cfe5 100644 --- a/tests/data/test1249 +++ b/tests/data/test1249 @@ -32,7 +32,7 @@ Access a non-proxied host with using the combination of --proxy option and NO_PR NO_PROXY=%HOSTIP -http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%PROXYPORT/ --max-time 5 +http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%NOLISTENPORT/ --max-time 5 diff --git a/tests/data/test1260 b/tests/data/test1260 index 1d86ecd4..b246882c 100644 --- a/tests/data/test1260 +++ b/tests/data/test1260 @@ -22,7 +22,7 @@ http HTTP URL with rubbish after port number --g "http://[%HOSTIP]:%HTTPPORT:80/we/want/1260" "http://%HOSTIP:%HTTPPORT:80/we/want/1260" "http://user@example.com:80@localhost" +-g "http://[%HOSTIP]:%NOLISTENPORT:80/we/want/1260" "http://%HOSTIP:%NOLISTENPORT:80/we/want/1260" "http://user@example.com:80@localhost" diff --git a/tests/data/test1263 b/tests/data/test1263 index 7462db4d..88b13775 100644 --- a/tests/data/test1263 +++ b/tests/data/test1263 @@ -23,7 +23,7 @@ http HTTP URL with rubbish after IPv6 bracket --g "http://[%HOSTIP]test:%HTTPPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%HTTPPORT/we/want/1263" "http://user@[::1]@localhost" +-g "http://[%HOSTIP]test:%NOLISTENPORT/we/want/1263" "http://[%HOSTIP][%HOSTIP]:%NOLISTENPORT/we/want/1263" "http://user@[::1]@localhost" diff --git a/tests/data/test1269 b/tests/data/test1269 index c7766363..7cf86cab 100644 --- a/tests/data/test1269 +++ b/tests/data/test1269 @@ -20,7 +20,7 @@ none too large --retry-delay value ---retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%HTTPPORT/1269 +--retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%NOLISTENPORT/1269 diff --git a/tests/data/test1296 b/tests/data/test1296 new file mode 100644 index 00000000..386eb18f --- /dev/null +++ b/tests/data/test1296 @@ -0,0 +1,56 @@ + + + +HTTP +HTTP Basic + + + +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# Client-side + + +http + + + +HTTP URL with %0a in name part + + + +http://user%0aname:password@%HOSTIP:%HTTPPORT/1296 + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /1296 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk +Accept: */* + + + + + diff --git a/tests/data/test1340 b/tests/data/test1340 index 81f1ed68..644fb2b5 100644 --- a/tests/data/test1340 +++ b/tests/data/test1340 @@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D file CURL_TESTDIR=%PWD/log -http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 +http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename %{filename_effective}\n" @@ -73,7 +73,7 @@ Content-Disposition: filename=name1340; charset=funny; option=strange -curl: Saved to filename '%PWD/log/name1340' +curl: Saved to filename %PWD/log/name1340 diff --git a/tests/data/test1341 b/tests/data/test1341 index b364edeb..ae226744 100644 --- a/tests/data/test1341 +++ b/tests/data/test1341 @@ -40,7 +40,7 @@ HTTP GET with -O -J and Content-Disposition, -D stdout CURL_TESTDIR=%PWD/log -http://%HOSTIP:%HTTPPORT/1341 -J -O -D - +http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_effective}\n" @@ -70,7 +70,7 @@ Connection: close Content-Type: text/html Content-Disposition: filename=name1341; charset=funny; option=strange -curl: Saved to filename '%PWD/log/name1341' +curl: Saved to filename %PWD/log/name1341 diff --git a/tests/data/test1409 b/tests/data/test1409 index 5ceb53be..8d54b4c9 100644 --- a/tests/data/test1409 +++ b/tests/data/test1409 @@ -17,7 +17,7 @@ none Pass in string to -C -http://%HOSTIP:%HTTPPORT/1409 -C wrong +http://%HOSTIP:%NOLISTENPORT/1409 -C wrong diff --git a/tests/data/test1410 b/tests/data/test1410 index 97ad0569..a8b89db3 100644 --- a/tests/data/test1410 +++ b/tests/data/test1410 @@ -17,7 +17,7 @@ none Pass in negative number to --max-time -http://%HOSTIP:%HTTPPORT/1410 --max-time -4 +http://%HOSTIP:%NOLISTENPORT/1410 --max-time -4 diff --git a/tests/data/test1427 b/tests/data/test1427 index 03cab4b9..648b1da5 100644 --- a/tests/data/test1427 +++ b/tests/data/test1427 @@ -15,7 +15,7 @@ none too large -m timeout value -http://%HOSTIP:%HTTPPORT/1427 -m 184467440737095510 +http://%HOSTIP:%NOLISTENPORT/1427 -m 184467440737095510 diff --git a/tests/data/test1446 b/tests/data/test1446 index 96d634e1..637df583 100644 --- a/tests/data/test1446 +++ b/tests/data/test1446 @@ -24,7 +24,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1446.dir SFTP with --remote-time ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test1446.dir/rofile.txt --insecure --remote-time +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test1446.dir/rofile.txt --insecure --remote-time perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1446.dir && \ diff --git a/tests/data/test1447 b/tests/data/test1447 index d1182942..8a651f00 100644 --- a/tests/data/test1447 +++ b/tests/data/test1447 @@ -24,7 +24,7 @@ proxy Provide illegal proxy name ---proxy "http://a:b@/x" http://%HOSTIP:%HTTPPORT +--proxy "http://a:b@/x" http://%HOSTIP:%NOLISTENPORT diff --git a/tests/data/test1453 b/tests/data/test1453 index eaf9dd3b..76b5acda 100644 --- a/tests/data/test1453 +++ b/tests/data/test1453 @@ -23,7 +23,7 @@ tftp Too long tftp filename -tftp://%HOSTIP:%TFTPPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz +tftp://%HOSTIP:%NOLISTENPORT/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz diff --git a/tests/data/test1460 b/tests/data/test1460 new file mode 100644 index 00000000..d7b30c5e --- /dev/null +++ b/tests/data/test1460 @@ -0,0 +1,62 @@ + + + +HTTP +HTTP GET +-J + + + +# + + +HTTP/1.1 200 swsclose + 12345 +fooo +54 3 2 1 +Content-Disposition: filename=name1460; charset=funny; option=strange + + + + +# +# Client-side + +# this relies on the debug feature to allow us to set directory to store the +# -J output in + +debug + + +http + + +HTTP GET with -Ji and Content-Disposition with existing file + + +CURL_TESTDIR=%PWD/log + + +http://%HOSTIP:%HTTPPORT/1460 -Ji -O + + +initial content + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + +# Warning: --include and --remote-header-name cannot be combined. + +2 + + +initial content + + + + diff --git a/tests/data/test1508 b/tests/data/test1508 index b276b8b3..fbdc322a 100644 --- a/tests/data/test1508 +++ b/tests/data/test1508 @@ -18,7 +18,7 @@ lib1508 Close a multi handle without using it -http://%HOSTIP:%HTTPPORT/path/1508 +http://%HOSTIP:%NOLISTENPORT/path/1508 diff --git a/tests/data/test1539 b/tests/data/test1539 new file mode 100644 index 00000000..b8546f27 --- /dev/null +++ b/tests/data/test1539 @@ -0,0 +1,43 @@ + + + +HTTP +HTTP POST +Content-Length +chunked Transfer-Encoding + + + +# Server-side + + +HTTP/1.1 200 OK +Date: Sun, 19 Jan 2014 18:50:58 GMT +Server: test-server/fake swsclose +Connection: close + + + +# Client-side + + +http + + +lib1539 + + +HTTP 1.0 POST with read callback and unknown data size + + +http://%HOSTIP:%HTTPPORT/1539 + + + +# Verify data after the test has been "shot" + + +25 + + + diff --git a/tests/data/test1550 b/tests/data/test1550 index b78756e9..c305dd6f 100644 --- a/tests/data/test1550 +++ b/tests/data/test1550 @@ -20,10 +20,10 @@ lib1550 -verify setting pipeling blacklisting options +verify setting pipeling blocklisting options -http://%HOSTIP:%HTTPPORT/1550 +http://%HOSTIP:%NOLISTENPORT/1550 diff --git a/tests/data/test1554 b/tests/data/test1554 index 06f18972..d3926d91 100644 --- a/tests/data/test1554 +++ b/tests/data/test1554 @@ -29,6 +29,12 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock @@ -40,6 +46,10 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock @@ -51,6 +61,10 @@ run 1: foobar and so on fun! <- Mutex unlock -> Mutex lock <- Mutex unlock +-> Mutex lock +<- Mutex unlock +-> Mutex lock +<- Mutex unlock run 1: foobar and so on fun! -> Mutex lock <- Mutex unlock diff --git a/tests/data/test1630 b/tests/data/test1630 new file mode 100644 index 00000000..1d381c7b --- /dev/null +++ b/tests/data/test1630 @@ -0,0 +1,56 @@ + + + +HTTP +HTTP GET +HTTPS-proxy +HTTPS-proxy Basic auth + + + +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Funny-head: yesyes +Content-Length: 22 + +the content goes here + + + +# Client-side + + +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/1630 --proxy-insecure + + +proxy + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET http://we.want.that.site.com/1630 HTTP/1.1 +Host: we.want.that.site.com +Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw== +Accept: */* +Proxy-Connection: Keep-Alive + + + + diff --git a/tests/data/test1631 b/tests/data/test1631 new file mode 100644 index 00000000..cd36b1d9 --- /dev/null +++ b/tests/data/test1631 @@ -0,0 +1,87 @@ + + + +FTP +HTTPS-proxy + + + +# Server-side + + +# This is the HTTPS proxy response + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Funny-head: yesyes +Content-Length: 0 + + + +# This is the FTP server response. The Life and Adventures of Robinson Crusoe + +I was born in the year 1632, in the city of York, of a good family, though not +of that country, myfather being a foreigner of Bremen, who settled first at +Hull. He got a good estate by merchandise,and leaving off his trade, lived +afterwards at York, from whence he had married my mother, whoserelations were +named Robinson, a very good family in that country, and from whom I was +calledRobinson Kreutznaer; but, by the usual corruption of words in England, +we are now called—nay wecall ourselves and write our name—Crusoe; and so my +companions always called me. + + + +# Client-side + + +ftp +https-proxy + + +FTP through HTTPS-proxy + + +-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1631 --proxy-insecure + + +proxy + + + +# Verify data after the test has been "shot" + + +# The second CONNECT will be made to the dynamic port number the FTP server +# opens for us, so we can't compare with a known pre-existing number! + +s/((https.proxy):(\d+))/$2:12345/ +s/^(User-Agent: curl).*/$1/ + + +CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1 +Host: ftp.site.thru.https.proxy:12345 +User-Agent: curl +Proxy-Connection: Keep-Alive + +CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1 +Host: ftp.site.thru.https.proxy:12345 +User-Agent: curl +Proxy-Connection: Keep-Alive + + + +USER anonymous +PASS ftp@example.com +PBSZ 0 +PROT P +PWD +EPSV +TYPE I +SIZE 1631 +RETR 1631 +QUIT + + + diff --git a/tests/data/test1632 b/tests/data/test1632 new file mode 100644 index 00000000..b10b2a68 --- /dev/null +++ b/tests/data/test1632 @@ -0,0 +1,105 @@ + + + +FTP +HTTPS-proxy + + + +# Server-side + + +# This is the HTTPS proxy response + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Funny-head: yesyes +Content-Length: 0 + + + +# This is the FTP server response. The Life and Adventures of Robinson Crusoe + +I was born in the year 1632, in the city of York, of a good family, though not +of that country, myfather being a foreigner of Bremen, who settled first at +Hull. He got a good estate by merchandise,and leaving off his trade, lived +afterwards at York, from whence he had married my mother, whoserelations were +named Robinson, a very good family in that country, and from whom I was +calledRobinson Kreutznaer; but, by the usual corruption of words in England, +we are now called—nay wecall ourselves and write our name—Crusoe; and so my +companions always called me. + + + +I had two elder brothers, one of whom was lieutenant-colonel to an +English regiment of foot inFlanders, formerly commanded by the famous Colonel +Lockhart, and was killed at the battle nearDunkirk against the Spaniards. +What became of my second brother I never knew, any more thanmy father or +mother knew what became of me. + + + + +# Client-side + + +ftp +https-proxy + + +FTP through HTTPS-proxy, with connection re-use + + +-p -x https://%HOSTIP:%HTTPSPROXYPORT ftp://ftp.site.thru.https.proxy:%FTPPORT/1632 --proxy-insecure ftp://ftp.site.thru.https.proxy:%FTPPORT/16320002 + + +proxy + + + +# Verify data after the test has been "shot" + + +# The second and third CONNECT will be made to the dynamic port number the FTP +# server opens for us, so we can't compare with known pre-existing numbers! + + +s/((https.proxy):(\d+))/$2:12345/ +s/^(User-Agent: curl).*/$1/ + + +CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1 +Host: ftp.site.thru.https.proxy:12345 +User-Agent: curl +Proxy-Connection: Keep-Alive + +CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1 +Host: ftp.site.thru.https.proxy:12345 +User-Agent: curl +Proxy-Connection: Keep-Alive + +CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1 +Host: ftp.site.thru.https.proxy:12345 +User-Agent: curl +Proxy-Connection: Keep-Alive + + + +USER anonymous +PASS ftp@example.com +PBSZ 0 +PROT P +PWD +EPSV +TYPE I +SIZE 1632 +RETR 1632 +EPSV +SIZE 16320002 +RETR 16320002 +QUIT + + + diff --git a/tests/data/test1633 b/tests/data/test1633 new file mode 100644 index 00000000..5d29ef13 --- /dev/null +++ b/tests/data/test1633 @@ -0,0 +1,97 @@ + + + +HTTP +HTTP GET + + + +# +# Server-side + + +HTTP/1.1 301 OK +Accept-Ranges: bytes +Content-Length: 0 +Connection: close +Location: /16330002 + + + +HTTP/1.1 429 too many requests +Retry-After: 1 +Content-Length: 0 +Connection: close + + + + +HTTP/1.1 301 OK +Accept-Ranges: bytes +Content-Length: 0 +Connection: close +Location: /16330002 + +HTTP/1.1 429 too many requests +Retry-After: 1 +Content-Length: 0 +Connection: close + +HTTP/1.1 301 OK +Accept-Ranges: bytes +Content-Length: 0 +Connection: close +Location: /16330002 + +HTTP/1.1 429 too many requests +Retry-After: 1 +Content-Length: 0 +Connection: close + + + + +# +# Client-side + + +http + + +HTTP GET + + +http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +POST /1633 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* +Content-Length: 3 +Content-Type: application/x-www-form-urlencoded + +mooGET /16330002 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + +POST /1633 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* +Content-Length: 3 +Content-Type: application/x-www-form-urlencoded + +mooGET /16330002 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + + diff --git a/tests/data/test1901 b/tests/data/test1901 index 83cdf729..793bd667 100644 --- a/tests/data/test1901 +++ b/tests/data/test1901 @@ -40,13 +40,13 @@ http lib1900 -HTTP GET using pipelining, blacklisted site +HTTP GET using pipelining, blocklisted site http://%HOSTIP:%HTTPPIPEPORT/ log/urls1901.txt -blacklist_site 127.0.0.1:%HTTPPIPEPORT +blocklist_site 127.0.0.1:%HTTPPIPEPORT 0 1k.txt 1000 100k.txt 0 1k.txt diff --git a/tests/data/test1909 b/tests/data/test1909 new file mode 100644 index 00000000..bde0e5e0 --- /dev/null +++ b/tests/data/test1909 @@ -0,0 +1,65 @@ + + + +HTTP +HTTP GET +retry + + + +# +# Server-side + + +HTTP/1.1 200 OK swsclose swsbounce +Content-Length: 5 +Connection: close + +bbb + + +HTTP/1.1 200 OK +Content-Length: 5 +Connection: close + +data + + + +# +# Client-side + + +http + + +HTTP GET --retry-all-errors to overcome partial transfer + + +--retry 1 --retry-all-errors -o log/outfile1909 http://%HOSTIP:%HTTPPORT/1909 + + + +# +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /1909 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + +GET /1909 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Accept: */* + + + + +data + + + + diff --git a/tests/data/test1910 b/tests/data/test1910 new file mode 100644 index 00000000..a1b3f575 --- /dev/null +++ b/tests/data/test1910 @@ -0,0 +1,68 @@ + + + +HTTP +HTTP Basic +CURLOPT_FOLLOWLOCATION + + + +# Server-side + + +HTTP/1.1 302 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Content-Length: 0 +Location: /19100002 + + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Content-Length: 4 + +hej + + + +# Client-side + + +http + + + +HTTP credentials with newline and redirect + + +lib1910 + + + +%HOSTIP:%HTTPPORT/1910 + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /1910 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA== +Accept: */* + +GET /19100002 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA== +Accept: */* + + + + diff --git a/tests/data/test2004 b/tests/data/test2004 index 5b3b68d0..f9add83d 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -30,7 +30,7 @@ sftp TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order ---key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure This is test data diff --git a/tests/data/test2036 b/tests/data/test2036 index 0ab8b66c..4b2ec43a 100644 --- a/tests/data/test2036 +++ b/tests/data/test2036 @@ -22,7 +22,7 @@ http HTTP, -O with no slash at all in the URL -%HOSTIP:%HTTPPORT -O +%HOSTIP:%NOLISTENPORT -O diff --git a/tests/data/test2047 b/tests/data/test2047 index d3654c78..1471d005 100644 --- a/tests/data/test2047 +++ b/tests/data/test2047 @@ -40,6 +40,7 @@ http idn +proxy LC_ALL=en_US.UTF-8 diff --git a/tests/data/test219 b/tests/data/test219 index 49f17e43..2b638950 100644 --- a/tests/data/test219 +++ b/tests/data/test219 @@ -24,7 +24,7 @@ proxy try using proxy with unsupported scheme --x foo://%HOSTIP:%HTTPPORT/219 http://%HOSTIP:%HTTPPORT/219 +-x foo://%HOSTIP:%NOLISTENPORT/219 http://%HOSTIP:%NOLISTENPORT/219 diff --git a/tests/data/test288 b/tests/data/test288 index e62eabd3..26e1b842 100644 --- a/tests/data/test288 +++ b/tests/data/test288 @@ -28,7 +28,7 @@ file file:// with (unsupported) proxy, authentication and range -all_proxy=http://fake:user@%HOSTIP:%HTTPPORT/ +all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/ file://localhost%FILE_PWD/log/test288.txt diff --git a/tests/data/test302 b/tests/data/test302 index 7bb162b4..3eb9e7ae 100644 --- a/tests/data/test302 +++ b/tests/data/test302 @@ -24,6 +24,7 @@ And you should ignore this data. SSL +proxy https diff --git a/tests/data/test333 b/tests/data/test333 index 198af9c8..0fd0591e 100644 --- a/tests/data/test333 +++ b/tests/data/test333 @@ -20,7 +20,7 @@ none Try a non-boolean command line option with --no- ---no-proxy "hey" http://%HOSTIP:%HTTPPORT/333 +--no-proxy "hey" http://%HOSTIP:%NOLISTENPORT/333 diff --git a/tests/data/test346 b/tests/data/test346 new file mode 100644 index 00000000..64923117 --- /dev/null +++ b/tests/data/test346 @@ -0,0 +1,60 @@ + + + +HTTP +proxy + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +proxy + + +http + + +HTTP GET over proxy with credentials using blank passwords + + +-x http://%HOSTIP:%HTTPPORT/346 -U puser: -u suser: http://remote.example/346 + + + +# + + +^User-Agent:.* + + +GET http://remote.example/346 HTTP/1.1 +Host: remote.example +Proxy-Authorization: Basic cHVzZXI6 +Authorization: Basic c3VzZXI6 +Accept: */* +Proxy-Connection: Keep-Alive + + + + diff --git a/tests/data/test501 b/tests/data/test501 index 674bc43b..8b3dac7e 100644 --- a/tests/data/test501 +++ b/tests/data/test501 @@ -26,7 +26,7 @@ lib501 simple libcurl attempt operation without URL set -http://%HOSTIP:%HTTPPORT/501 +http://%HOSTIP:%NOLISTENPORT/501 diff --git a/tests/data/test504 b/tests/data/test504 index be8f95e2..351ae749 100644 --- a/tests/data/test504 +++ b/tests/data/test504 @@ -32,7 +32,7 @@ lib504 simple multi through local proxy without listener -http://%HOSTIP:%HTTPSPORT/504 %HOSTIP:%NOLISTENPORT +http://%HOSTIP:%NOLISTENPORT/504 %HOSTIP:%NOLISTENPORT diff --git a/tests/data/test509 b/tests/data/test509 index 5de1599e..0e0dd212 100644 --- a/tests/data/test509 +++ b/tests/data/test509 @@ -34,10 +34,7 @@ nothing # Verify data after the test has been "shot" -seen custom_calloc() -seen custom_malloc() -seen custom_realloc() -seen custom_free() +Callbacks were invoked! diff --git a/tests/data/test543 b/tests/data/test543 index 45563303..f7e687c4 100644 --- a/tests/data/test543 +++ b/tests/data/test543 @@ -30,6 +30,8 @@ curl_easy_escape %9C%26K%3DI%04%A1%01%E0%D8%7C%20%B7%EFS%29%FA%1DW%E1 +IN: '' OUT: '' +IN: ' 12' OUT: '%2012' diff --git a/tests/data/test552 b/tests/data/test552 index 47dd41ab..a02023a5 100644 Binary files a/tests/data/test552 and b/tests/data/test552 differ diff --git a/tests/data/test558 b/tests/data/test558 index dccb8080..94697967 100644 --- a/tests/data/test558 +++ b/tests/data/test558 @@ -38,7 +38,6 @@ nothing MEM lib558.c: malloc() MEM lib558.c: free() -MEM escape.c: malloc() MEM strdup.c: realloc() MEM strdup.c: realloc() MEM escape.c: free() diff --git a/tests/data/test582 b/tests/data/test582 index 65d85b23..8ac6bc86 100644 --- a/tests/data/test582 +++ b/tests/data/test582 @@ -24,7 +24,7 @@ lib582 SFTP upload using multi interface -Sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/upload582.txt %PWD/log/file582.txt %USER: +Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload582.txt %PWD/log/file582.txt %USER: Moooooooooooo diff --git a/tests/data/test583 b/tests/data/test583 index 2c41ca1d..e7d95960 100644 --- a/tests/data/test583 +++ b/tests/data/test583 @@ -29,7 +29,7 @@ SFTP with multi interface, remove handle early # name resolve will cause it to return rather quickly and thus we could trigger # the problem we're looking to verify. -sftp://localhost:%SSHPORT%POSIX_PWD/log/upload583.txt %USER: +sftp://localhost:%SSHPORT%SSH_PWD/log/upload583.txt %USER: diff --git a/tests/data/test600 b/tests/data/test600 index 2a139b81..f9415e0e 100644 --- a/tests/data/test600 +++ b/tests/data/test600 @@ -24,7 +24,7 @@ sftp SFTP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file600.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file600.txt --insecure Test data diff --git a/tests/data/test601 b/tests/data/test601 index 544a8806..c89b6453 100644 --- a/tests/data/test601 +++ b/tests/data/test601 @@ -24,7 +24,7 @@ scp SCP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file601.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file601.txt --insecure Test data diff --git a/tests/data/test602 b/tests/data/test602 index 6bb0df3f..dd300c74 100644 --- a/tests/data/test602 +++ b/tests/data/test602 @@ -21,7 +21,7 @@ sftp SFTP put ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file602.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/upload.602 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file602.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.602 --insecure Test data diff --git a/tests/data/test603 b/tests/data/test603 index 879e4c0f..b96c4057 100644 --- a/tests/data/test603 +++ b/tests/data/test603 @@ -21,7 +21,7 @@ scp SCP upload ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file603.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/upload.603 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file603.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.603 --insecure Test data diff --git a/tests/data/test604 b/tests/data/test604 index f76a7fb2..f503e669 100644 --- a/tests/data/test604 +++ b/tests/data/test604 @@ -16,7 +16,7 @@ sftp SFTP retrieval of nonexistent file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/not-a-valid-file-moooo --insecure +--key curl_client_key --pubkey 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 a18ab299..29555fa8 100644 --- a/tests/data/test605 +++ b/tests/data/test605 @@ -16,7 +16,7 @@ scp SCP retrieval of nonexistent file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/not-a-valid-file-moooo --insecure +--key curl_client_key --pubkey 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 37e21086..c790bd68 100644 --- a/tests/data/test606 +++ b/tests/data/test606 @@ -16,7 +16,7 @@ sftp SFTP invalid user login ---key curl_client_key --pubkey curl_client_key.pub -u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/not-a-valid-file-moooo --insecure +--key curl_client_key --pubkey 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 e4224515..8c13e584 100644 --- a/tests/data/test607 +++ b/tests/data/test607 @@ -16,7 +16,7 @@ scp SCP invalid user login ---key curl_client_key --pubkey curl_client_key.pub -u not-a-valid-user: scp://%HOSTIP:%SSHPORT%POSIX_PWD/not-a-valid-file-moooo --insecure +--key curl_client_key --pubkey 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 86391f08..b4d01055 100644 --- a/tests/data/test608 +++ b/tests/data/test608 @@ -24,7 +24,7 @@ sftp SFTP post-quote rename ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file608.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file608.txt --insecure # Verify that the file was renamed properly, then rename the file back to what # it was so the verify section works and the file can be cleaned up. diff --git a/tests/data/test609 b/tests/data/test609 index 4a9da1a9..5aa9eecf 100644 --- a/tests/data/test609 +++ b/tests/data/test609 @@ -25,7 +25,7 @@ sftp SFTP post-quote mkdir failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file609.txt" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file609.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file609.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file609.txt --insecure Test file for mkdir test diff --git a/tests/data/test610 b/tests/data/test610 index 17914641..d0974215 100644 --- a/tests/data/test610 +++ b/tests/data/test610 @@ -27,7 +27,7 @@ perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test610.dir SFTP post-quote rmdir ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test610.dir" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file610.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test610.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file610.txt --insecure perl %SRCDIR/libtest/test610.pl gone %PWD/log/test610.dir diff --git a/tests/data/test611 b/tests/data/test611 index f40a4bda..6362002e 100644 --- a/tests/data/test611 +++ b/tests/data/test611 @@ -27,7 +27,7 @@ perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test611.dir SFTP post-quote rename ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test611.dir %PWD/log/test611.new" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file611.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test611.dir %PWD/log/test611.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file611.txt --insecure perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test611.new diff --git a/tests/data/test612 b/tests/data/test612 index 4fed660d..ae18afbc 100644 --- a/tests/data/test612 +++ b/tests/data/test612 @@ -24,7 +24,7 @@ sftp SFTP post-quote remove file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file612.txt -Q "-rm %PWD/log/file612.txt" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/upload.612 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file612.txt -Q "-rm %PWD/log/file612.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.612 --insecure perl %SRCDIR/libtest/test610.pl gone %PWD/log/test612.txt diff --git a/tests/data/test613 b/tests/data/test613 index c4d82fbf..0383987e 100644 --- a/tests/data/test613 +++ b/tests/data/test613 @@ -10,8 +10,6 @@ directory # Server-side -d????????? N U U N ??? N NN:NN . -d????????? N U U N ??? N NN:NN .. d????????? N U U N ??? N NN:NN asubdir -rw?rw?rw? 1 U U 37 Jan 1 2000 plainfile.txt -r-?r-?r-? 1 U U 47 Dec 31 2000 rofile.txt @@ -31,7 +29,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test613.dir SFTP directory retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test613.dir/ --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test613.dir/ --insecure perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test613.dir %PWD/log/curl613.out diff --git a/tests/data/test614 b/tests/data/test614 index bcc07275..c6fe4919 100644 --- a/tests/data/test614 +++ b/tests/data/test614 @@ -11,8 +11,6 @@ directory # Server-side -d????????? N U U N ??? N NN:NN . -d????????? N U U N ??? N NN:NN .. d????????? N U U N ??? N NN:NN asubdir -r-?r-?r-? 1 U U 37 Jan 1 2000 plainfile.txt -r-?r-?r-? 1 U U 47 Dec 31 2000 rofile.txt @@ -32,7 +30,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test614.dir SFTP pre-quote chmod ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test614.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test614.dir/ --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test614.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test614.dir/ --insecure perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test614.dir %PWD/log/curl614.out diff --git a/tests/data/test615 b/tests/data/test615 index 7c50a28b..5f4859c2 100644 --- a/tests/data/test615 +++ b/tests/data/test615 @@ -20,7 +20,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test615.dir SFTP put remote failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file615.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test615.dir/rofile.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file615.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test615.dir/rofile.txt --insecure perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test615.dir diff --git a/tests/data/test616 b/tests/data/test616 index 5b464b06..14c3d337 100644 --- a/tests/data/test616 +++ b/tests/data/test616 @@ -23,7 +23,7 @@ sftp SFTP retrieval of empty file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file616.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file616.txt --insecure diff --git a/tests/data/test617 b/tests/data/test617 index 21c1e3b3..67f0c9a1 100644 --- a/tests/data/test617 +++ b/tests/data/test617 @@ -23,7 +23,7 @@ scp SCP retrieval of empty file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file617.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file617.txt --insecure diff --git a/tests/data/test618 b/tests/data/test618 index 23f03ac6..feb095eb 100644 --- a/tests/data/test618 +++ b/tests/data/test618 @@ -15,7 +15,7 @@ sftp SFTP retrieval of two files ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file618.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file618.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file618.txt --insecure Test data diff --git a/tests/data/test619 b/tests/data/test619 index 3397c1f1..6c1273c0 100644 --- a/tests/data/test619 +++ b/tests/data/test619 @@ -15,7 +15,7 @@ scp SCP retrieval of two files ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file619.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file619.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file619.txt --insecure Test data diff --git a/tests/data/test620 b/tests/data/test620 index 28019e79..46382551 100644 --- a/tests/data/test620 +++ b/tests/data/test620 @@ -16,7 +16,7 @@ sftp SFTP retrieval of missing file followed by good file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file620.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file620.txt --insecure Test data diff --git a/tests/data/test621 b/tests/data/test621 index 2b39e9f7..f0ac9b72 100644 --- a/tests/data/test621 +++ b/tests/data/test621 @@ -16,7 +16,7 @@ scp SCP retrieval of missing file followed by good file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file621.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file621.txt --insecure Test data diff --git a/tests/data/test622 b/tests/data/test622 index 8f1a6e46..7b5fd5b2 100644 --- a/tests/data/test622 +++ b/tests/data/test622 @@ -22,7 +22,7 @@ sftp SFTP put failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file622.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/nonexistent-directory/nonexistent-file --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file622.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure Test data diff --git a/tests/data/test623 b/tests/data/test623 index 2c6a4381..e2914c9d 100644 --- a/tests/data/test623 +++ b/tests/data/test623 @@ -22,7 +22,7 @@ scp SCP upload failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file623.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/nonexistent-directory/nonexistent-file --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file623.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure Test data diff --git a/tests/data/test624 b/tests/data/test624 index 15b65a8d..8aaf527e 100644 --- a/tests/data/test624 +++ b/tests/data/test624 @@ -22,7 +22,7 @@ sftp SFTP put with --ftp-create-dirs ---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file624.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test624.dir/upload.624 --insecure +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file624.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test624.dir/upload.624 --insecure perl %SRCDIR/libtest/test610.pl move %PWD/log/test624.dir/upload.624 %PWD/log/upload.624 rmdir %PWD/log/test624.dir diff --git a/tests/data/test625 b/tests/data/test625 index 8a5a2ae3..1fe9b55c 100644 --- a/tests/data/test625 +++ b/tests/data/test625 @@ -22,7 +22,7 @@ sftp SFTP put with --ftp-create-dirs twice ---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file625.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test625.a/upload.625 -T log/file625.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test625.b/upload.625 --insecure +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.a/upload.625 -T log/file625.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test625.b/upload.625 --insecure perl %SRCDIR/libtest/test610.pl move %PWD/log/test625.a/upload.625 %PWD/log/upload.625 rmdir %PWD/log/test625.a rm %PWD/log/test625.b/upload.625 rmdir %PWD/log/test625.b diff --git a/tests/data/test626 b/tests/data/test626 index fd955692..edf2aa52 100644 --- a/tests/data/test626 +++ b/tests/data/test626 @@ -22,7 +22,7 @@ sftp SFTP invalid quote command ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file626.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file626.txt --insecure Test file for rename test diff --git a/tests/data/test628 b/tests/data/test628 index b5aaec6a..86c00f16 100644 --- a/tests/data/test628 +++ b/tests/data/test628 @@ -16,7 +16,7 @@ sftp SFTP invalid user login (password authentication) --u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/irrelevant-file --insecure +-u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure diff --git a/tests/data/test629 b/tests/data/test629 index 7ce5e300..07ac767a 100644 --- a/tests/data/test629 +++ b/tests/data/test629 @@ -16,7 +16,7 @@ scp SCP invalid user login (password authentication) --u not-a-valid-user: scp://%HOSTIP:%SSHPORT%POSIX_PWD/irrelevant-file --insecure +-u not-a-valid-user: scp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure diff --git a/tests/data/test630 b/tests/data/test630 index ffde8ea5..f678528b 100644 --- a/tests/data/test630 +++ b/tests/data/test630 @@ -17,7 +17,7 @@ sftp SFTP incorrect host key ---hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/irrelevant-file --insecure +--hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/irrelevant-file --insecure diff --git a/tests/data/test631 b/tests/data/test631 index ddb7d280..720f3716 100644 --- a/tests/data/test631 +++ b/tests/data/test631 @@ -17,7 +17,7 @@ scp SCP incorrect host key ---hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/irrelevant-file --insecure +--hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/irrelevant-file --insecure diff --git a/tests/data/test632 b/tests/data/test632 index 63f5630a..70cfe515 100644 --- a/tests/data/test632 +++ b/tests/data/test632 @@ -20,7 +20,7 @@ sftp SFTP syntactically invalid host key ---hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/irrelevant-file --insecure +--hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%SSH_PWD/log/irrelevant-file --insecure diff --git a/tests/data/test633 b/tests/data/test633 index d87bfb99..913d981f 100644 --- a/tests/data/test633 +++ b/tests/data/test633 @@ -24,7 +24,7 @@ sftp SFTP retrieval with byte range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file633.txt -r 5-9 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file633.txt -r 5-9 --insecure Test data diff --git a/tests/data/test634 b/tests/data/test634 index c93e09e5..fc250f9c 100644 --- a/tests/data/test634 +++ b/tests/data/test634 @@ -25,7 +25,7 @@ sftp SFTP retrieval with byte range past end of file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file634.txt -r 5-99 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file634.txt -r 5-99 --insecure Test data diff --git a/tests/data/test635 b/tests/data/test635 index e572567f..16ef66c0 100644 --- a/tests/data/test635 +++ b/tests/data/test635 @@ -24,7 +24,7 @@ sftp SFTP retrieval with byte range relative to end of file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file635.txt -r -9 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file635.txt -r -9 --insecure Test data diff --git a/tests/data/test636 b/tests/data/test636 index 29f16571..0ea35090 100644 --- a/tests/data/test636 +++ b/tests/data/test636 @@ -25,7 +25,7 @@ sftp SFTP retrieval with X- byte range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file636.txt -r 5- --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file636.txt -r 5- --insecure Test data diff --git a/tests/data/test637 b/tests/data/test637 index c0f760fe..71b81268 100644 --- a/tests/data/test637 +++ b/tests/data/test637 @@ -23,7 +23,7 @@ sftp SFTP retrieval with invalid X- range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file637.txt -r 99- --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file637.txt -r 99- --insecure Test data diff --git a/tests/data/test638 b/tests/data/test638 index 1e42596a..fdc140c6 100644 --- a/tests/data/test638 +++ b/tests/data/test638 @@ -29,7 +29,7 @@ perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test638.dir SFTP post-quote rename * asterisk accept-fail ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test638.dir %PWD/log/test638.new" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file638.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test638.dir %PWD/log/test638.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file638.txt --insecure perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test638.new diff --git a/tests/data/test639 b/tests/data/test639 index bb06be75..d80c8c14 100644 --- a/tests/data/test639 +++ b/tests/data/test639 @@ -29,7 +29,7 @@ perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test639.dir SFTP post-quote rename * asterisk accept-fail ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test639-not-exists-dir %PWD/log/test639.new" sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file639.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test639-not-exists-dir %PWD/log/test639.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file639.txt --insecure perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test639.dir diff --git a/tests/data/test640 b/tests/data/test640 index 979ac2ba..9d1ade4c 100644 --- a/tests/data/test640 +++ b/tests/data/test640 @@ -23,7 +23,7 @@ sftp SFTP --head retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file640.txt --insecure --head +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file640.txt --insecure --head Test data diff --git a/tests/data/test641 b/tests/data/test641 index cc1da944..9f168aae 100644 --- a/tests/data/test641 +++ b/tests/data/test641 @@ -23,7 +23,7 @@ scp SCP --head retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file641.txt --insecure --head +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file641.txt --insecure --head Test data diff --git a/tests/data/test642 b/tests/data/test642 index 084626f0..6ae52bb8 100644 --- a/tests/data/test642 +++ b/tests/data/test642 @@ -24,7 +24,7 @@ sftp SFTP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file642.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file642.txt --insecure Test data diff --git a/tests/data/test656 b/tests/data/test656 index 8591490e..fb0f27fb 100644 --- a/tests/data/test656 +++ b/tests/data/test656 @@ -16,7 +16,7 @@ sftp SFTP retrieval with nonexistent private key file ---key DOES_NOT_EXIST --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/not-a-valid-file-moooo --insecure --connect-timeout 8 +--key DOES_NOT_EXIST --pubkey 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/test664 b/tests/data/test664 index cb73b248..6bea4ed1 100644 --- a/tests/data/test664 +++ b/tests/data/test664 @@ -24,7 +24,7 @@ sftp SFTP correct host key ---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file664.txt +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file664.txt test diff --git a/tests/data/test665 b/tests/data/test665 index 830adb8f..689fa31b 100644 --- a/tests/data/test665 +++ b/tests/data/test665 @@ -24,7 +24,7 @@ scp SCP correct host key ---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file665.txt +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file665.txt test diff --git a/tests/data/test75 b/tests/data/test75 index 115963df..62aeb119 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -27,11 +27,6 @@ HTTP, urlglob retrieval with bad range "http://a-site-never-accessed.example.org/[2-1]" -o "log/weee#1.dump" --stderr - -# The error message on stdout implicitly depends on the length of the -# URL, so refuse to run if the length is unexpected. - -perl %SRCDIR/libtest/test75.pl http://%HOSTIP:%HTTPPORT/ 22 - # diff --git a/tests/data/test76 b/tests/data/test76 index ada3a335..b6c47cd8 100644 --- a/tests/data/test76 +++ b/tests/data/test76 @@ -22,7 +22,7 @@ http HTTP, -O with no file name part in the URL -http://%HOSTIP:%HTTPPORT/76/ -O +http://%HOSTIP:%NOLISTENPORT/76/ -O diff --git a/tests/data/test895 b/tests/data/test895 new file mode 100644 index 00000000..78d48c47 --- /dev/null +++ b/tests/data/test895 @@ -0,0 +1,50 @@ + + + +IMAP +Clear Text +FETCH +--login-options + + + +# +# Server-side + + +From: me@somewhere +To: fake@nowhere + +body + +-- + yours sincerely + + + +# +# Client-side + + +imap + + +IMAP with --login-options 'AUTH=*' + + +'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=*' + + + +# +# Verify data after the test has been "shot" + + +A001 CAPABILITY +A002 LOGIN "\"user" "sec\"ret{" +A003 SELECT 895 +A004 FETCH 1 BODY[] +A005 LOGOUT + + + diff --git a/tests/data/test896 b/tests/data/test896 new file mode 100644 index 00000000..c972906a --- /dev/null +++ b/tests/data/test896 @@ -0,0 +1,38 @@ + + + +IMAP +Clear Text +FETCH +--login-options + + + +# +# Server-side + + + +# +# Client-side + + +imap + + +IMAP with --login-options 'AUTH=dummy' (failing) + + +'imap://%HOSTIP:%IMAPPORT/895/;MAILINDEX=1' -u '"user:sec"ret{' --login-options 'AUTH=dummy' + + + +# +# Verify data after the test has been "shot" + +# 3 == CURLE_URL_MALFORMAT + +3 + + + diff --git a/tests/data/test970 b/tests/data/test970 index 54e34cc5..e6d138f4 100644 --- a/tests/data/test970 +++ b/tests/data/test970 @@ -33,6 +33,7 @@ http debug +proxy CURL_TIME=13 diff --git a/tests/data/test971 b/tests/data/test971 new file mode 100644 index 00000000..de134e8e --- /dev/null +++ b/tests/data/test971 @@ -0,0 +1,25 @@ + + + +source analysis +options-in-versions + + + +# +# Client-side + + +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 + + + + -- cgit v1.2.3