From: Daniel Stenberg Date: Tue, 26 Aug 2025 14:06:35 +0000 (+0200) Subject: tests: remove the QUIT filters X-Git-Tag: curl-8_16_0~76 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d77a23c263f108e6cb347d2e756a79cf53934275;p=thirdparty%2Fcurl.git tests: remove the QUIT filters Once added in cd4aee156f64f44bb1f1 to work around connection shutdown issues. Closes #18405 --- diff --git a/tests/data/test100 b/tests/data/test100 index 54d31744b7..b7554383ea 100644 --- a/tests/data/test100 +++ b/tests/data/test100 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1000 b/tests/data/test1000 index e102a006e0..fe94010ac3 100644 --- a/tests/data/test1000 +++ b/tests/data/test1000 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1003 b/tests/data/test1003 index 4947d1dfb5..06cfbb61b0 100644 --- a/tests/data/test1003 +++ b/tests/data/test1003 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1005 b/tests/data/test1005 index 8a036bb606..28af85f40e 100644 --- a/tests/data/test1005 +++ b/tests/data/test1005 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1006 b/tests/data/test1006 index a8da3f73bf..b3d0936724 100644 --- a/tests/data/test1006 +++ b/tests/data/test1006 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test101 b/tests/data/test101 index 8acbd21f7f..3febc5e72a 100644 --- a/tests/data/test101 +++ b/tests/data/test101 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1010 b/tests/data/test1010 index cd03372935..d45efdc8a5 100644 --- a/tests/data/test1010 +++ b/tests/data/test1010 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test102 b/tests/data/test102 index 151dd80252..7037986f46 100644 --- a/tests/data/test102 +++ b/tests/data/test102 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1028 b/tests/data/test1028 index 9592fb66fb..3e36597322 100644 --- a/tests/data/test1028 +++ b/tests/data/test1028 @@ -52,9 +52,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L # # Verify data after the test has been "shot" - -QUIT - GET /%TESTNUMBER0001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test103 b/tests/data/test103 index 66705310c5..52e5645bc0 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P - # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1036 b/tests/data/test1036 index 1343a8b7ce..f777a6ff7d 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -40,9 +40,6 @@ This is the start!! # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1037 b/tests/data/test1037 index 967561b3b6..18c9e5266a 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1038 b/tests/data/test1038 index 102d356152..c2e60a0a49 100644 --- a/tests/data/test1038 +++ b/tests/data/test1038 @@ -34,9 +34,6 @@ worx? # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1039 b/tests/data/test1039 index 342290459b..a032c2f9ab 100644 --- a/tests/data/test1039 +++ b/tests/data/test1039 @@ -34,9 +34,6 @@ worx? # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test104 b/tests/data/test104 index f8d3d3eace..3674f1da0a 100644 --- a/tests/data/test104 +++ b/tests/data/test104 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1044 b/tests/data/test1044 index a0705d331c..471f099a3f 100644 --- a/tests/data/test1044 +++ b/tests/data/test1044 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1047 b/tests/data/test1047 index b7d17275b3..b863bd0061 100644 --- a/tests/data/test1047 +++ b/tests/data/test1047 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1048 b/tests/data/test1048 index 5aed75a374..cf90020fef 100644 --- a/tests/data/test1048 +++ b/tests/data/test1048 @@ -48,9 +48,6 @@ FTP-IPv6 dir list PASV with localhost --interface # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test105 b/tests/data/test105 index 7f30529901..2a26ac7eca 100644 --- a/tests/data/test105 +++ b/tests/data/test105 @@ -37,9 +37,6 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii # Verify data after the test has been "shot" - -QUIT - USER userdude PASS passfellow diff --git a/tests/data/test1050 b/tests/data/test1050 index 0f8267f95a..3aa2f017e3 100644 --- a/tests/data/test1050 +++ b/tests/data/test1050 @@ -44,9 +44,6 @@ FTP-IPv6 dir list, EPRT with specified IP # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of EPRT that curl can send s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test1055 b/tests/data/test1055 index 0624a969a7..2d1c604b4d 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -54,9 +54,6 @@ the # # Verify data after the test has been "shot" - -QUIT - PUT /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test1057 b/tests/data/test1057 index e211dd7da3..a7cb3bc61e 100644 --- a/tests/data/test1057 +++ b/tests/data/test1057 @@ -36,9 +36,6 @@ FTP retrieve a byte-range relative to end of file # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test106 b/tests/data/test106 index 2fec634782..b5e1e6929b 100644 --- a/tests/data/test106 +++ b/tests/data/test106 @@ -35,9 +35,6 @@ FTP GET with type=A style ASCII URL using %20 codes # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1062 b/tests/data/test1062 index 36b726af81..31a27a9473 100644 --- a/tests/data/test1062 +++ b/tests/data/test1062 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test107 b/tests/data/test107 index a92a635f84..a741b7667f 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" - -QUIT - data to diff --git a/tests/data/test108 b/tests/data/test108 index ceea4d4b25..20ef6577ed 100644 --- a/tests/data/test108 +++ b/tests/data/test108 @@ -31,9 +31,6 @@ Moooooooooooo # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test109 b/tests/data/test109 index 63d1bc6b6a..d466437f21 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -31,9 +31,6 @@ Moooooooooooo # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1091 b/tests/data/test1091 index b5006c6bc2..445d31655f 100644 --- a/tests/data/test1091 +++ b/tests/data/test1091 @@ -30,9 +30,6 @@ FTP URL with type=i # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1096 b/tests/data/test1096 index f8eb1d4fb2..e7b1639247 100644 --- a/tests/data/test1096 +++ b/tests/data/test1096 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - 78 diff --git a/tests/data/test110 b/tests/data/test110 index c3c3d04bf7..e53fcd1377 100644 --- a/tests/data/test110 +++ b/tests/data/test110 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1102 b/tests/data/test1102 index 12822b95ae..16994d9533 100644 --- a/tests/data/test1102 +++ b/tests/data/test1102 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1103 b/tests/data/test1103 index 2ceb89de03..a53b504bdc 100644 --- a/tests/data/test1103 +++ b/tests/data/test1103 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1107 b/tests/data/test1107 index de8b7d76e1..8b31c76f83 100644 --- a/tests/data/test1107 +++ b/tests/data/test1107 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test111 b/tests/data/test111 index a7cd3c3d27..a46f7aef1d 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000 # Verify data after the test has been "shot" - -QUIT - 36 diff --git a/tests/data/test1113 b/tests/data/test1113 index c7eaf2e938..744c012ee1 100644 --- a/tests/data/test1113 +++ b/tests/data/test1113 @@ -36,9 +36,6 @@ FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response) ############################################ # Verify data after the test has been "shot" - -QUIT - 0 diff --git a/tests/data/test112 b/tests/data/test112 index 231f3452fa..41bbc025d9 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -31,9 +31,6 @@ worx? # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1137 b/tests/data/test1137 index 4e8f24f090..cb20aee313 100644 --- a/tests/data/test1137 +++ b/tests/data/test1137 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1149 b/tests/data/test1149 index 4b3ba376e0..d4e97d540d 100644 --- a/tests/data/test1149 +++ b/tests/data/test1149 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test115 b/tests/data/test115 index e4da7ea1fa..22f75c0b6e 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - 13 diff --git a/tests/data/test1152 b/tests/data/test1152 index 6052b70b5e..1823bab4a9 100644 --- a/tests/data/test1152 +++ b/tests/data/test1152 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1153 b/tests/data/test1153 index 56ed840051..a74b1838ce 100644 --- a/tests/data/test1153 +++ b/tests/data/test1153 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test116 b/tests/data/test116 index cab67ad577..0ab00aae91 100644 --- a/tests/data/test116 +++ b/tests/data/test116 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P 1.2.3.4 # Verify data after the test has been "shot" - -QUIT - 30 diff --git a/tests/data/test1162 b/tests/data/test1162 index 5aa706b7f9..b6b394139e 100644 --- a/tests/data/test1162 +++ b/tests/data/test1162 @@ -37,9 +37,6 @@ MSYS2_ARG_CONV_EXCL=ftp:// - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1163 b/tests/data/test1163 index 09ede0cb87..a109b511bc 100644 --- a/tests/data/test1163 +++ b/tests/data/test1163 @@ -33,9 +33,6 @@ FTP wildcard with pattern ending with an open-bracket - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test117 b/tests/data/test117 index c292af7307..3bd5cb57f1 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - 17 diff --git a/tests/data/test118 b/tests/data/test118 index de70121400..9b5b8708eb 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - 19 diff --git a/tests/data/test119 b/tests/data/test119 index 2b36051f9d..4426def0bd 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" - -QUIT - 19 diff --git a/tests/data/test120 b/tests/data/test120 index 6e285b433f..64628b6599 100644 --- a/tests/data/test120 +++ b/tests/data/test120 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file" # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1206 b/tests/data/test1206 index 6abb0c5964..228df4adb7 100644 --- a/tests/data/test1206 +++ b/tests/data/test1206 @@ -33,9 +33,6 @@ FTP PORT and 425 on download # Verify data after the test has been "shot" - -QUIT - s/^EPRT \|1\|(.*)/EPRT \|1\|/ diff --git a/tests/data/test1207 b/tests/data/test1207 index e192e425eb..612c42b0d6 100644 --- a/tests/data/test1207 +++ b/tests/data/test1207 @@ -33,9 +33,6 @@ FTP PORT and 421 on download # Verify data after the test has been "shot" - -QUIT - s/^EPRT \|1\|(.*)/EPRT \|1\|/ diff --git a/tests/data/test121 b/tests/data/test121 index d9dfe2794d..3625d0e3e0 100644 --- a/tests/data/test121 +++ b/tests/data/test121 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_tra # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1217 b/tests/data/test1217 index 47059b247a..691c88e732 100644 --- a/tests/data/test1217 +++ b/tests/data/test1217 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/agai # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1219 b/tests/data/test1219 index b28077dcec..454654399b 100644 --- a/tests/data/test1219 +++ b/tests/data/test1219 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - PWD EPSV diff --git a/tests/data/test122 b/tests/data/test122 index 0566b24074..1f007c1ce0 100644 --- a/tests/data/test122 +++ b/tests/data/test122 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1224 b/tests/data/test1224 index 61036cd085..64ba4482c5 100644 --- a/tests/data/test1224 +++ b/tests/data/test1224 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1225 b/tests/data/test1225 index 39abfcb912..b20363c3e4 100644 --- a/tests/data/test1225 +++ b/tests/data/test1225 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUM # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1226 b/tests/data/test1226 index 4ae0e6aff8..08e706b9b0 100644 --- a/tests/data/test1226 +++ b/tests/data/test1226 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1227 b/tests/data/test1227 index f8246fa466..30477a46a0 100644 --- a/tests/data/test1227 +++ b/tests/data/test1227 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test123 b/tests/data/test123 index 1d29c8668f..8ccd69cf68 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1233 b/tests/data/test1233 index 7b59c8ed47..9563533496 100644 --- a/tests/data/test1233 +++ b/tests/data/test1233 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test124 b/tests/data/test124 index 2dfc96bb8a..d2717949c9 100644 --- a/tests/data/test124 +++ b/tests/data/test124 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test125 b/tests/data/test125 index a615d092fe..8de97c14e5 100644 --- a/tests/data/test125 +++ b/tests/data/test125 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - 9 diff --git a/tests/data/test126 b/tests/data/test126 index 285618f111..b830fc7781 100644 --- a/tests/data/test126 +++ b/tests/data/test126 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1262 b/tests/data/test1262 index 2cb5d8857c..0a7046ce93 100644 --- a/tests/data/test1262 +++ b/tests/data/test1262 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test127 b/tests/data/test127 index 6871e0dc4e..ebf122d018 100644 --- a/tests/data/test127 +++ b/tests/data/test127 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test128 b/tests/data/test128 index d46f454efd..089717da79 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -35,9 +35,6 @@ the # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test130 b/tests/data/test130 index a0673dd8fe..2c4dfe85eb 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -50,9 +50,6 @@ default login userdef password passwddef # # Verify data after the test has been "shot" - -QUIT - USER user1 PASS passwd1 diff --git a/tests/data/test131 b/tests/data/test131 index 0511520f73..4a73de2850 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -47,9 +47,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" - -QUIT - USER user2 PASS passwd2 diff --git a/tests/data/test1316 b/tests/data/test1316 index c3f70878a7..2218b6e147 100644 --- a/tests/data/test1316 +++ b/tests/data/test1316 @@ -60,9 +60,6 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test132 b/tests/data/test132 index 47748494bf..77d47c8fd2 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -47,9 +47,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" - -QUIT - USER mary PASS mark diff --git a/tests/data/test133 b/tests/data/test133 index f80d840ab8..4a2c46cde4 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -47,9 +47,6 @@ machine %HOSTIP login mary password drfrank # # Verify data after the test has been "shot" - -QUIT - USER mary PASS drfrank diff --git a/tests/data/test134 b/tests/data/test134 index aa104bf15b..207e4f5d47 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -49,9 +49,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" - -QUIT - USER romulus PASS rhemus diff --git a/tests/data/test1348 b/tests/data/test1348 index fde0ffb24c..b99ab58f8d 100644 --- a/tests/data/test1348 +++ b/tests/data/test1348 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1349 b/tests/data/test1349 index 4167366674..03f91ae23a 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test135 b/tests/data/test135 index cdb548362f..3dc1d531f5 100644 --- a/tests/data/test135 +++ b/tests/data/test135 @@ -38,9 +38,6 @@ FTP retrieve a byte-range # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1350 b/tests/data/test1350 index f896f22b14..60d3620773 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1351 b/tests/data/test1351 index 947300f671..05a22ce629 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1352 b/tests/data/test1352 index a74d2f33fe..ae94e5aad4 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1353 b/tests/data/test1353 index a4df5d8bad..45aad1c4ba 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1354 b/tests/data/test1354 index 3413d46775..c7ff933cc1 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1355 b/tests/data/test1355 index e99dd015d9..7158a6e99f 100644 --- a/tests/data/test1355 +++ b/tests/data/test1355 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1356 b/tests/data/test1356 index 77a88be563..e690747f16 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1357 b/tests/data/test1357 index b0943b7f6d..926fd538d9 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1358 b/tests/data/test1358 index c71520c959..14fc95afee 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1359 b/tests/data/test1359 index 63cdc4ce35..c26ac187b4 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test136 b/tests/data/test136 index f71f4b36ad..ef0b2c49ac 100644 --- a/tests/data/test136 +++ b/tests/data/test136 @@ -28,9 +28,6 @@ FTP with user and no password # Verify data after the test has been "shot" - -QUIT - USER user PASS diff --git a/tests/data/test1360 b/tests/data/test1360 index 6f8732a1eb..a7ed493023 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1361 b/tests/data/test1361 index c80b097a58..18c9f5f08c 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER -- # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1362 b/tests/data/test1362 index 9e4890ae05..261950969b 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1363 b/tests/data/test1363 index 4ef72cf772..022940257d 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test137 b/tests/data/test137 index 8154af88df..33b93589ec 100644 --- a/tests/data/test137 +++ b/tests/data/test137 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1378 b/tests/data/test1378 index f8551251ad..199679cab6 100644 --- a/tests/data/test1378 +++ b/tests/data/test1378 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1379 b/tests/data/test1379 index 9cecb0eae0..39b66ebe3b 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test138 b/tests/data/test138 index e00c3110ca..db3b6ec7df 100644 --- a/tests/data/test138 +++ b/tests/data/test138 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1380 b/tests/data/test1380 index d534223959..cca8020eb0 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1381 b/tests/data/test1381 index 28c2af5fe2..3455369a98 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1382 b/tests/data/test1382 index d96ad468a7..78d05a3215 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1383 b/tests/data/test1383 index 2c9f332917..96c3e9a278 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1384 b/tests/data/test1384 index 1dd2aa280e..4251c42a1e 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1385 b/tests/data/test1385 index 8654da6540..c14ddba20f 100644 --- a/tests/data/test1385 +++ b/tests/data/test1385 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1386 b/tests/data/test1386 index 44b8dcd422..72f13ca582 100644 --- a/tests/data/test1386 +++ b/tests/data/test1386 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1387 b/tests/data/test1387 index 6a24b76783..43c28cc582 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1388 b/tests/data/test1388 index a26a829c07..0a3c173e50 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1389 b/tests/data/test1389 index 77f7b5f273..0c648309e5 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test139 b/tests/data/test139 index 61a0da601a..160f628e2c 100644 --- a/tests/data/test139 +++ b/tests/data/test139 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989" # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1390 b/tests/data/test1390 index be7cf2ed9b..6b3f4dad3e 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1391 b/tests/data/test1391 index c0c5bc58af..447a578291 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1392 b/tests/data/test1392 index 49472104ed..4af7966889 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1393 b/tests/data/test1393 index 81734206e7..492da66fc0 100644 --- a/tests/data/test1393 +++ b/tests/data/test1393 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test140 b/tests/data/test140 index cacef2ae20..5e29f5c7c7 100644 --- a/tests/data/test140 +++ b/tests/data/test140 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004" # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1405 b/tests/data/test1405 index 0b1be439b4..b4560aa052 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test141 b/tests/data/test141 index 5ffbc45235..425a98f2a6 100644 --- a/tests/data/test141 +++ b/tests/data/test141 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1414 b/tests/data/test1414 index 9fc2a56ffa..4be9b54222 100644 --- a/tests/data/test1414 +++ b/tests/data/test1414 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P - # Verify data after the test has been "shot" - -QUIT - s/^(EPRT \|1\|)(.*)/$1/ s/^(PORT)(.*)/$1/ diff --git a/tests/data/test142 b/tests/data/test142 index e09b744f93..cb03b832af 100644 --- a/tests/data/test142 +++ b/tests/data/test142 @@ -26,9 +26,6 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test143 b/tests/data/test143 index 8984a3f1f6..ed89e70dec 100644 --- a/tests/data/test143 +++ b/tests/data/test143 @@ -28,9 +28,6 @@ FTP URL with type=a # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test144 b/tests/data/test144 index e7a983bcad..be2ca5c8c5 100644 --- a/tests/data/test144 +++ b/tests/data/test144 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1444 b/tests/data/test1444 index 860c663040..2f4c8d0687 100644 --- a/tests/data/test1444 +++ b/tests/data/test1444 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1449 b/tests/data/test1449 index d761f3c0e7..0b9de0192c 100644 --- a/tests/data/test1449 +++ b/tests/data/test1449 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232- # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test145 b/tests/data/test145 index 7f12b36f36..53f3f631d7 100644 --- a/tests/data/test145 +++ b/tests/data/test145 @@ -30,9 +30,6 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l # Verify data after the test has been "shot" - -QUIT - 19 diff --git a/tests/data/test146 b/tests/data/test146 index c7586573e4..803fbfc4d7 100644 --- a/tests/data/test146 +++ b/tests/data/test146 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNU # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test147 b/tests/data/test147 index b2772f607d..769043d489 100644 --- a/tests/data/test147 +++ b/tests/data/test147 @@ -31,9 +31,6 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test148 b/tests/data/test148 index c8ec7a6d18..051d31a9de 100644 --- a/tests/data/test148 +++ b/tests/data/test148 @@ -28,9 +28,6 @@ ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test149 b/tests/data/test149 index 60d9089ae7..404922b296 100644 --- a/tests/data/test149 +++ b/tests/data/test149 @@ -27,9 +27,6 @@ send away this contents # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test1501 b/tests/data/test1501 index 070ff7d97a..195c17998c 100644 --- a/tests/data/test1501 +++ b/tests/data/test1501 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ # Verify data after the test has been "shot" - -QUIT - 0 diff --git a/tests/data/test1547 b/tests/data/test1547 index 244151a5ab..067b3568ed 100644 --- a/tests/data/test1547 +++ b/tests/data/test1547 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1569 b/tests/data/test1569 index 24f16ee788..159a813919 100644 --- a/tests/data/test1569 +++ b/tests/data/test1569 @@ -40,9 +40,6 @@ lib%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1570 b/tests/data/test1570 index e558b9bc32..713ab5ea77 100644 --- a/tests/data/test1570 +++ b/tests/data/test1570 @@ -40,9 +40,6 @@ lib1569 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test1631 b/tests/data/test1631 index 7c470b3c84..e838700fe7 100644 --- a/tests/data/test1631 +++ b/tests/data/test1631 @@ -54,9 +54,6 @@ proxy # Verify data after the test has been "shot" - -QUIT - # 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! diff --git a/tests/data/test1632 b/tests/data/test1632 index 18d400fd4b..9d877f8f87 100644 --- a/tests/data/test1632 +++ b/tests/data/test1632 @@ -63,9 +63,6 @@ proxy # Verify data after the test has been "shot" - -QUIT - # 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! diff --git a/tests/data/test182 b/tests/data/test182 index b49f10f85e..cb1e4f0c20 100644 --- a/tests/data/test182 +++ b/tests/data/test182 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test191 b/tests/data/test191 index 749a34ec98..0293693631 100644 --- a/tests/data/test191 +++ b/tests/data/test191 @@ -27,9 +27,6 @@ FTP URL with ?-letters in username and password # Verify data after the test has been "shot" - -QUIT - USER use?r PASS pass?word diff --git a/tests/data/test2000 b/tests/data/test2000 index ee2e507349..032bf5b1b4 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -46,9 +46,6 @@ moo # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test2001 b/tests/data/test2001 index 39eb1ff9dd..de16735313 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -63,9 +63,6 @@ moo # # Verify data after the test has been "shot" - -QUIT - GET /%TESTNUMBER0001 HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test2002 b/tests/data/test2002 index 7a581a5cbb..4b2b4fef69 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -73,9 +73,6 @@ moo # Verify data after the test has been "shot" -QUIT - - ^timeout = [5-6]$ diff --git a/tests/data/test2003 b/tests/data/test2003 index e37fd4e04f..5ab3e41ac6 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -73,9 +73,6 @@ moo # Verify data after the test has been "shot" -QUIT - - ^timeout = [5-6]$ diff --git a/tests/data/test2039 b/tests/data/test2039 index 05f23ab743..7cab984ce5 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -48,9 +48,6 @@ machine %HOSTIP login user2 password passwd2 # # Verify data after the test has been "shot" - -QUIT - USER userdef PASS passwddef diff --git a/tests/data/test210 b/tests/data/test210 index c4ccb6b2c3..1ee313d76a 100644 --- a/tests/data/test210 +++ b/tests/data/test210 @@ -33,9 +33,6 @@ data blobb # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test211 b/tests/data/test211 index 01dcad0eea..6830727ab6 100644 --- a/tests/data/test211 +++ b/tests/data/test211 @@ -34,9 +34,6 @@ data blobb # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test212 b/tests/data/test212 index a16bf42113..045ad3769a 100644 --- a/tests/data/test212 +++ b/tests/data/test212 @@ -39,9 +39,6 @@ data blobb # Verify data after the test has been "shot" - -QUIT - # Strip the addresses and port number but leave the rest s/^(EPRT \|1\|)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\|\d{1,5}\|/$1/ diff --git a/tests/data/test215 b/tests/data/test215 index d2ba2c702f..058639f272 100644 --- a/tests/data/test215 +++ b/tests/data/test215 @@ -38,9 +38,6 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNU # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test216 b/tests/data/test216 index a0ec72be1e..1be87c0d1e 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -27,9 +27,6 @@ upload this file twice # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test227 b/tests/data/test227 index bf55fdd6c6..f7b445185d 100644 --- a/tests/data/test227 +++ b/tests/data/test227 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test228 b/tests/data/test228 index ae19b534b0..8e7d73ff0c 100644 --- a/tests/data/test228 +++ b/tests/data/test228 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test2307 b/tests/data/test2307 index cbb581a4ab..198976bf96 100644 --- a/tests/data/test2307 +++ b/tests/data/test2307 @@ -41,9 +41,6 @@ FTP retrieve a byte-range with end larger than file # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test235 b/tests/data/test235 index 4e112398a0..7081a776c8 100644 --- a/tests/data/test235 +++ b/tests/data/test235 @@ -33,9 +33,6 @@ worx? # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test236 b/tests/data/test236 index 13493f26a5..a66fa046d9 100644 --- a/tests/data/test236 +++ b/tests/data/test236 @@ -33,9 +33,6 @@ Test data # Verify data after the test has been "shot" - -QUIT - USER anonymous diff --git a/tests/data/test238 b/tests/data/test238 index 3173237eb7..6e2af83d7e 100644 --- a/tests/data/test238 +++ b/tests/data/test238 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - # 13 = CURLE_FTP_WEIRD_PASV_REPLY 13 diff --git a/tests/data/test244 b/tests/data/test244 index ad9cf4fe2d..782be2be40 100644 --- a/tests/data/test244 +++ b/tests/data/test244 @@ -41,9 +41,6 @@ FTP dir listing with nocwd and URL encoded path # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test247 b/tests/data/test247 index db11c93b29..8b154f419b 100644 --- a/tests/data/test247 +++ b/tests/data/test247 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test248 b/tests/data/test248 index ed3f3779ff..b497dd7af2 100644 --- a/tests/data/test248 +++ b/tests/data/test248 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 # Verify data after the test has been "shot" - -QUIT - data to diff --git a/tests/data/test250 b/tests/data/test250 index 59f7fa3115..4f01ea79a3 100644 --- a/tests/data/test250 +++ b/tests/data/test250 @@ -46,9 +46,6 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test251 b/tests/data/test251 index 6de2003c8f..9ed8c94880 100644 --- a/tests/data/test251 +++ b/tests/data/test251 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test252 b/tests/data/test252 index 35c3014a0b..1480ee1ec1 100644 --- a/tests/data/test252 +++ b/tests/data/test252 @@ -45,9 +45,6 @@ FTP IPv6 dir list PASV # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test253 b/tests/data/test253 index 8f7192d21b..01ec416ac6 100644 --- a/tests/data/test253 +++ b/tests/data/test253 @@ -45,9 +45,6 @@ FTP IPv6 dir list with EPRT # # Verify data after the test has been "shot" - -QUIT - s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test254 b/tests/data/test254 index ede445355a..90b58a0b30 100644 --- a/tests/data/test254 +++ b/tests/data/test254 @@ -46,9 +46,6 @@ FTP IPv6 dir list PASV and --disable-epsv # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test255 b/tests/data/test255 index 190908e350..1a1526a10c 100644 --- a/tests/data/test255 +++ b/tests/data/test255 @@ -46,9 +46,6 @@ FTP IPv6 dir list with EPRT and --disable-eprt # # Verify data after the test has been "shot" - -QUIT - s/^(EPRT \|2\|::1\|)(.*)/$1/ diff --git a/tests/data/test261 b/tests/data/test261 index 192b2bcd7d..d5f940372e 100644 --- a/tests/data/test261 +++ b/tests/data/test261 @@ -34,9 +34,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test270 b/tests/data/test270 index f4f5a02316..efa183f155 100644 --- a/tests/data/test270 +++ b/tests/data/test270 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test272 b/tests/data/test272 index 5607a10816..2857c3eac3 100644 --- a/tests/data/test272 +++ b/tests/data/test272 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -z "2004 jan 1 12:12:12 UTC" # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test280 b/tests/data/test280 index dbe809e1da..1aee4b517f 100644 --- a/tests/data/test280 +++ b/tests/data/test280 @@ -46,9 +46,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement" # # Verify data after the test has been "shot" - -QUIT - USER anonymous USER replacement diff --git a/tests/data/test290 b/tests/data/test290 index 6ffa9a7261..e7048a5384 100644 --- a/tests/data/test290 +++ b/tests/data/test290 @@ -27,9 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30 # Verify data after the test has been "shot" - -QUIT - 63 diff --git a/tests/data/test291 b/tests/data/test291 index 2385f7db4f..05cc2b444a 100644 --- a/tests/data/test291 +++ b/tests/data/test291 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test294 b/tests/data/test294 index 4e2e9857d1..67108aedb9 100644 --- a/tests/data/test294 +++ b/tests/data/test294 @@ -47,9 +47,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct" # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test296 b/tests/data/test296 index d4b87dfa4f..c88ec99bf7 100644 --- a/tests/data/test296 +++ b/tests/data/test296 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method multicwd # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test297 b/tests/data/test297 index d982a3b7f5..99c10d3e13 100644 --- a/tests/data/test297 +++ b/tests/data/test297 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method singlecwd # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test298 b/tests/data/test298 index 3880a60732..5188c85477 100644 --- a/tests/data/test298 +++ b/tests/data/test298 @@ -31,9 +31,6 @@ FTP CWD with --ftp-method nocwd # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test3027 b/tests/data/test3027 index 416c0079db..05a811f4e8 100644 --- a/tests/data/test3027 +++ b/tests/data/test3027 @@ -40,9 +40,6 @@ data blobb # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test336 b/tests/data/test336 index 4e881379a0..f50b42adb3 100644 --- a/tests/data/test336 +++ b/tests/data/test336 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test337 b/tests/data/test337 index b82f947868..d44a712fbb 100644 --- a/tests/data/test337 +++ b/tests/data/test337 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6 # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test348 b/tests/data/test348 index 988e5bd049..55e9d608dd 100644 --- a/tests/data/test348 +++ b/tests/data/test348 @@ -36,9 +36,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # Verify data after the test has been "shot" - -QUIT - data to diff --git a/tests/data/test350 b/tests/data/test350 index 7342275d45..3eb8b80aa6 100644 --- a/tests/data/test350 +++ b/tests/data/test350 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test351 b/tests/data/test351 index 31c07fa3c9..ffa93e3e29 100644 --- a/tests/data/test351 +++ b/tests/data/test351 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test352 b/tests/data/test352 index d54ab60ebf..0cc4d69fd1 100644 --- a/tests/data/test352 +++ b/tests/data/test352 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test353 b/tests/data/test353 index dedd06960b..a94828bd6b 100644 --- a/tests/data/test353 +++ b/tests/data/test353 @@ -41,9 +41,6 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test354 b/tests/data/test354 index 9a40d49c61..dc6d732d8b 100644 --- a/tests/data/test354 +++ b/tests/data/test354 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PWD diff --git a/tests/data/test362 b/tests/data/test362 index d259593fd8..e8ce9731ed 100644 --- a/tests/data/test362 +++ b/tests/data/test362 @@ -29,9 +29,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at - -QUIT - data to diff --git a/tests/data/test380 b/tests/data/test380 index 47676e3dd8..f9ccafdabc 100644 --- a/tests/data/test380 +++ b/tests/data/test380 @@ -48,9 +48,6 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" - -QUIT - USER mary PASS yram diff --git a/tests/data/test381 b/tests/data/test381 index bf28773024..41b9eb779c 100644 --- a/tests/data/test381 +++ b/tests/data/test381 @@ -52,9 +52,6 @@ machine %HOSTIP login mary password yram # # Verify data after the test has been "shot" - -QUIT - USER mary PASS drfrank diff --git a/tests/data/test416 b/tests/data/test416 index f50ad70dda..b6b10b3df2 100644 --- a/tests/data/test416 +++ b/tests/data/test416 @@ -38,9 +38,6 @@ FTP growing file support # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test475 b/tests/data/test475 index 75e0e6b93a..32ad8071f5 100644 --- a/tests/data/test475 +++ b/tests/data/test475 @@ -30,9 +30,6 @@ FTP PASV upload ASCII file # Verify data after the test has been "shot" - -QUIT - %repeat[1750 x a line of text used for verifying this !%0a]% diff --git a/tests/data/test476 b/tests/data/test476 index 2396d3eeaa..792488fd17 100644 --- a/tests/data/test476 +++ b/tests/data/test476 @@ -26,9 +26,6 @@ FTP PASV upload ASCII file already using CRLF # Verify data after the test has been "shot" - -QUIT - %repeat[1750 x a line of text used for verifying this !%0a]% diff --git a/tests/data/test494 b/tests/data/test494 index c089d75c77..648318729d 100644 --- a/tests/data/test494 +++ b/tests/data/test494 @@ -46,9 +46,6 @@ machine %HOSTIP login user1 password passwd1 # # Verify data after the test has been "shot" - -QUIT - USER user1 PASS passwd1 diff --git a/tests/data/test505 b/tests/data/test505 index 70dfcda06a..53a9d47927 100644 --- a/tests/data/test505 +++ b/tests/data/test505 @@ -41,9 +41,6 @@ works? # Verify data after the test has been "shot" - -QUIT - Contents of diff --git a/tests/data/test511 b/tests/data/test511 index 7637dceded..adcabe8bda 100644 --- a/tests/data/test511 +++ b/tests/data/test511 @@ -35,9 +35,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" - -QUIT - # CURLE_REMOTE_FILE_NOT_FOUND 78 diff --git a/tests/data/test520 b/tests/data/test520 index 17d89199bf..6a27bb3f8e 100644 --- a/tests/data/test520 +++ b/tests/data/test520 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/520 # # Verify data after the test has been "shot" - -QUIT - USER anonymous diff --git a/tests/data/test521 b/tests/data/test521 index eaeb040d32..90473b33a0 100644 --- a/tests/data/test521 +++ b/tests/data/test521 @@ -44,9 +44,6 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT # # Verify data after the test has been "shot" - -QUIT - USER xxx PASS yyy diff --git a/tests/data/test525 b/tests/data/test525 index 82a85276fe..2b96a7fd96 100644 --- a/tests/data/test525 +++ b/tests/data/test525 @@ -36,9 +36,6 @@ Moooooooooooo # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test526 b/tests/data/test526 index 3a303e9a00..85b24d5db9 100644 --- a/tests/data/test526 +++ b/tests/data/test526 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test527 b/tests/data/test527 index 2522af586b..3cfe7998cc 100644 --- a/tests/data/test527 +++ b/tests/data/test527 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test529 b/tests/data/test529 index 243cc11d77..1c21c15efe 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -36,9 +36,6 @@ Moooooooooooo # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test531 b/tests/data/test531 index 33739ea7eb..59501d5ead 100644 --- a/tests/data/test531 +++ b/tests/data/test531 @@ -39,9 +39,6 @@ don't upload this # Verify data after the test has been "shot" - -QUIT - # Strip all valid kinds of PORT and EPRT that curl can send ^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3} diff --git a/tests/data/test532 b/tests/data/test532 index 255c055188..ac97e89b9c 100644 --- a/tests/data/test532 +++ b/tests/data/test532 @@ -39,9 +39,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test533 b/tests/data/test533 index f6467acaa6..1dbceb6dd3 100644 --- a/tests/data/test533 +++ b/tests/data/test533 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test534 b/tests/data/test534 index 87b98b5e79..0e0f35abdd 100644 --- a/tests/data/test534 +++ b/tests/data/test534 @@ -38,9 +38,6 @@ ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TE # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test539 b/tests/data/test539 index b774ead0bb..7985a52347 100644 --- a/tests/data/test539 +++ b/tests/data/test539 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test541 b/tests/data/test541 index ed4de68b98..787faa3d98 100644 --- a/tests/data/test541 +++ b/tests/data/test541 @@ -41,9 +41,6 @@ works? # Verify data after the test has been "shot" - -QUIT - diff --git a/tests/data/test542 b/tests/data/test542 index 4a412c8bf9..b39b1b30d1 100644 --- a/tests/data/test542 +++ b/tests/data/test542 @@ -44,9 +44,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # There's no MTDM in the protocol here since this code doesn't ask for the # time/date of the file - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test546 b/tests/data/test546 index 6021b67581..f8f01641a0 100644 --- a/tests/data/test546 +++ b/tests/data/test546 @@ -44,9 +44,6 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test562 b/tests/data/test562 index c2cf2546ca..d1793891d0 100644 --- a/tests/data/test562 +++ b/tests/data/test562 @@ -39,9 +39,6 @@ FTP a type=A URL and CURLOPT_PORT set # There's no MTDM in the protocol here since this code doesn't ask for the # time/date of the file - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test564 b/tests/data/test564 index 3b0a2ae1ed..96a6f9b1a6 100644 --- a/tests/data/test564 +++ b/tests/data/test564 @@ -45,9 +45,6 @@ proxy # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test574 b/tests/data/test574 index 46c4883b61..1b185e98a9 100644 --- a/tests/data/test574 +++ b/tests/data/test574 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt ############################################ # Verify data after the test has been "shot" - -QUIT - 0 diff --git a/tests/data/test575 b/tests/data/test575 index 4ed302fbb1..b1725a9b2a 100644 --- a/tests/data/test575 +++ b/tests/data/test575 @@ -32,9 +32,6 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/* # Verify data after the test has been "shot" - -QUIT - 0 diff --git a/tests/data/test582 b/tests/data/test582 index d0bc54e1ee..cc3fe52654 100644 --- a/tests/data/test582 +++ b/tests/data/test582 @@ -34,8 +34,6 @@ Moooooooooooo # Verify data after the test has been "shot" - - diff --git a/tests/data/test586 b/tests/data/test586 index b1cd990025..d441ff5ecf 100644 --- a/tests/data/test586 +++ b/tests/data/test586 @@ -45,9 +45,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test588 b/tests/data/test588 index d41131c423..9c8c5f3202 100644 --- a/tests/data/test588 +++ b/tests/data/test588 @@ -45,9 +45,6 @@ Moooooooooooo # Verify data after the test has been "shot" - -QUIT - # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test591 b/tests/data/test591 index 10d12ca263..d1cbf082a4 100644 --- a/tests/data/test591 +++ b/tests/data/test591 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" - -QUIT - # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test592 b/tests/data/test592 index a6fbaf72b5..f77eb9a870 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" - -QUIT - # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test593 b/tests/data/test593 index 5c3bdf35fe..9a15a5184e 100644 --- a/tests/data/test593 +++ b/tests/data/test593 @@ -47,9 +47,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" - -QUIT - # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test594 b/tests/data/test594 index e0dfc56e35..cd98f0b9d8 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -49,9 +49,6 @@ Moooooooooooo for %TESTNUMBER # Verify data after the test has been "shot" - -QUIT - # Strip off parts of the PORT and EPRT commands that might differ s/^PORT (.*)/PORT/ diff --git a/tests/data/test595 b/tests/data/test595 index 9a80aa7e26..65f23f7ead 100644 --- a/tests/data/test595 +++ b/tests/data/test595 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test596 b/tests/data/test596 index 38f24ab92c..2c257a704a 100644 --- a/tests/data/test596 +++ b/tests/data/test596 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp # # Verify data after the test has been "shot" - -QUIT - s/^(EPRT \|1\|)(.*)/$1/ diff --git a/tests/data/test661 b/tests/data/test661 index 799d51e2d5..5965bd8aea 100644 --- a/tests/data/test661 +++ b/tests/data/test661 @@ -33,9 +33,6 @@ ftp://%HOSTIP:%FTPPORT/ # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test698 b/tests/data/test698 index 5fdf10541d..10cf42cea9 100644 --- a/tests/data/test698 +++ b/tests/data/test698 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" ftp://%HOSTIP:%FTPP # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test706 b/tests/data/test706 index 8fbb24ba55..faafd90385 100644 --- a/tests/data/test706 +++ b/tests/data/test706 @@ -47,9 +47,6 @@ FTP dir list PASV via SOCKS4 # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test707 b/tests/data/test707 index f22b2010ee..2c41dfea70 100644 --- a/tests/data/test707 +++ b/tests/data/test707 @@ -47,9 +47,6 @@ FTP dir list PASV via SOCKS5 # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test711 b/tests/data/test711 index 288fcc1df4..355ca0e51e 100644 --- a/tests/data/test711 +++ b/tests/data/test711 @@ -43,9 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test712 b/tests/data/test712 index ef64b3f5bc..7bcc2a1bbb 100644 --- a/tests/data/test712 +++ b/tests/data/test712 @@ -37,9 +37,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test713 b/tests/data/test713 index 81374027fe..44820a78ff 100644 --- a/tests/data/test713 +++ b/tests/data/test713 @@ -38,9 +38,6 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5 # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test714 b/tests/data/test714 index 6414188e6f..a38400bb80 100644 --- a/tests/data/test714 +++ b/tests/data/test714 @@ -57,9 +57,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test715 b/tests/data/test715 index e931e0d608..6f9670af54 100644 --- a/tests/data/test715 +++ b/tests/data/test715 @@ -59,9 +59,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com # # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test754 b/tests/data/test754 index 9253d9f225..42234bab22 100644 --- a/tests/data/test754 +++ b/tests/data/test754 @@ -42,9 +42,6 @@ ftp://%HOSTIP:%FTPPORT/path/ -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q # Verify data after the test has been "shot" - -QUIT - USER anonymous PASS ftp@example.com diff --git a/tests/data/test973 b/tests/data/test973 index 16c9929e06..edf2973ebe 100644 --- a/tests/data/test973 +++ b/tests/data/test973 @@ -66,9 +66,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret # # Verify data after the test has been "shot" - -QUIT - GET /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test975 b/tests/data/test975 index 1add457910..971e35d340 100644 --- a/tests/data/test975 +++ b/tests/data/test975 @@ -66,9 +66,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret # # Verify data after the test has been "shot" - -QUIT - GET /%TESTNUMBER HTTP/1.1 Host: %HOSTIP:%HTTPPORT diff --git a/tests/data/test998 b/tests/data/test998 index c3594913d4..efb03cac4c 100644 --- a/tests/data/test998 +++ b/tests/data/test998 @@ -69,9 +69,6 @@ HTTP with auth in URL redirected to another host # # Verify data after the test has been "shot" - -QUIT - GET http://somewhere.example/998 HTTP/1.1 Host: somewhere.example diff --git a/tests/data/test999 b/tests/data/test999 index 4f5fafe6f8..c0dc52328d 100644 --- a/tests/data/test999 +++ b/tests/data/test999 @@ -59,9 +59,6 @@ HTTP with auth in first URL but not second # # Verify data after the test has been "shot" - -QUIT - GET http://somewhere.example/%TESTNUMBER HTTP/1.1 Host: somewhere.example