diff --git a/tests/data/test103 b/tests/data/test103 index 23df6df9ffc66b6389916d41a2cfb4dd333563ba..224e32a9ed0cbb286507720042da07e78828d089 100644 --- a/tests/data/test103 +++ b/tests/data/test103 @@ -34,6 +34,7 @@ PWD CWD a/path PORT 127,0,0,1,246,33 TYPE I +SIZE 103 RETR 103 </protocol> </verify> diff --git a/tests/data/test105 b/tests/data/test105 index 3cecc296c91453cd793c1696f9a2f3ccfa120117..3ae69d4e59db98667aac03c251b525c2669f1884 100644 --- a/tests/data/test105 +++ b/tests/data/test105 @@ -18,6 +18,10 @@ FTP user+password in URL and ASCII transfer <command> ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii </command> +<file name="log/ftpserver.cmd"> +REPLY EPSV 500 no such command +REPLY SIZE 500 no such command +</file> </test> # Verify data after the test has been "shot" @@ -26,8 +30,10 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/103 --use-ascii USER userdude PASS passfellow PWD +EPSV PASV TYPE A +SIZE 103 RETR 103 </protocol> </verify> diff --git a/tests/data/test106 b/tests/data/test106 index 61c43b8f69bfb6bcd944df20a451c1d43def8131..fdf6cb019be6c16927129db895345ab826d8a4a8 100644 --- a/tests/data/test106 +++ b/tests/data/test106 @@ -27,8 +27,9 @@ USER anonymous PASS curl_by_daniel@haxx.se PWD CWD /path with spaces/and things2 -PASV +EPSV TYPE A +SIZE 106 RETR 106 </protocol> </verify> diff --git a/tests/data/test107 b/tests/data/test107 index 98fa773ad7cd0868e3179f5dd34c6a5a92c0a591..ebbeefee9822a61928c478fea3034ed46611775c 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -31,7 +31,7 @@ works USER anonymous PASS curl_by_daniel@haxx.se PWD -PASV +EPSV TYPE I STOR 107 </protocol> diff --git a/tests/data/test109 b/tests/data/test109 index 18661885d59494fec2127fdd6b8fec57fe001003..a109c62c000fe4187259c0e4b6ce2c54973c3583 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -26,7 +26,7 @@ Moooooooooooo USER anonymous PASS curl_by_daniel@haxx.se PWD -PASV +EPSV TYPE I APPE 109 </protocol> diff --git a/tests/data/test110 b/tests/data/test110 index ce0df48d3e501a9df547d63071032e267707072c..310517468aa581bb2ae36e81b1facd035e4320a9 100644 --- a/tests/data/test110 +++ b/tests/data/test110 @@ -17,6 +17,9 @@ FTP download resume with set limit <command> ftp://%HOSTIP:%FTPPORT/110 -C 20 </command> +<file name="log/ftpserver.cmd"> +REPLY EPSV 500 no such command +</file> </test> # Verify data after the test has been "shot" @@ -27,6 +30,7 @@ ftp://%HOSTIP:%FTPPORT/110 -C 20 USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I SIZE 110 diff --git a/tests/data/test111 b/tests/data/test111 index 6201f34940031e95fc91f0761fc7b63b9df4e2c4..8e80ecb620a90cb9707c2282c0d1a05e2603fa34 100644 --- a/tests/data/test111 +++ b/tests/data/test111 @@ -26,7 +26,7 @@ ftp://%HOSTIP:%FTPPORT/111 -C 2000 USER anonymous PASS curl_by_daniel@haxx.se PWD -PASV +EPSV TYPE I SIZE 111 </protocol> diff --git a/tests/data/test112 b/tests/data/test112 index 712a16cec465022e2e1b8884f6627d45b4d29902..b55152242877b31cb60cfb54cea32c6fde46a974 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -25,7 +25,7 @@ worx? USER anonymous PASS curl_by_daniel@haxx.se PWD -PASV +EPSV TYPE I APPE 112 </protocol> diff --git a/tests/data/test115 b/tests/data/test115 index a480f91179eb3f1583daa108ae09a0eacecf30e5..73ee731f211ed027db7ad828c1636f6b64195c9a 100644 --- a/tests/data/test115 +++ b/tests/data/test115 @@ -12,6 +12,7 @@ ftp://%HOSTIP:%FTPPORT/115 </command> <file name="log/ftpserver.cmd"> REPLY PASV 314 bluah you f00l! +REPLY EPSV 314 bluah you f00l! </file> </test> @@ -24,6 +25,7 @@ REPLY PASV 314 bluah you f00l! USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV </protocol> </verify> diff --git a/tests/data/test117 b/tests/data/test117 index 617fc9149f4f2d8778bc49119a124ee52c18592a..edd5b7e09f4acccce21248dd7a680166c9eadd24 100644 --- a/tests/data/test117 +++ b/tests/data/test117 @@ -11,6 +11,7 @@ FTP download, failed TYPE ftp://%HOSTIP:%FTPPORT/117 </command> <file name="log/ftpserver.cmd"> +REPLY EPSV 314 bluah you f00l! REPLY TYPE 314 bluah you f00l! </file> </test> @@ -24,6 +25,7 @@ REPLY TYPE 314 bluah you f00l! USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I </protocol> diff --git a/tests/data/test118 b/tests/data/test118 index 42dca01dbe34f0445211f1543347f77b07c6f7ba..ffd3e0130cc8a91142bb51b1d79548aecd4b866e 100644 --- a/tests/data/test118 +++ b/tests/data/test118 @@ -12,6 +12,7 @@ ftp://%HOSTIP:%FTPPORT/118 </command> <file name="log/ftpserver.cmd"> REPLY RETR 314 bluah you f00l! +REPLY EPSV 314 bluah you f00l! </file> </test> @@ -24,8 +25,10 @@ REPLY RETR 314 bluah you f00l! USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I +SIZE 118 RETR 118 </protocol> </verify> diff --git a/tests/data/test119 b/tests/data/test119 index 9ba070e54e942a0d6ecdae70ffedfc45483086e6..4aa681482cd4d821a2df1d682feaf1a024b2cde6 100644 --- a/tests/data/test119 +++ b/tests/data/test119 @@ -30,6 +30,7 @@ USER anonymous PASS curl_by_daniel@haxx.se PWD TYPE I +SIZE 119 RETR 119 </protocol> </verify> diff --git a/tests/data/test120 b/tests/data/test120 index 095d03bd1d11ddde77bee7d1240b23d046fcf0fa..bb97eff4a96204ab0959443cb57be373b3b14580 100644 --- a/tests/data/test120 +++ b/tests/data/test120 @@ -18,6 +18,9 @@ ftp download with post-quote delete operation <command> ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file" </command> +<file name="log/ftpserver.cmd"> +REPLY EPSV 314 bluah you f00l! +</file> </test> # Verify data after the test has been "shot" @@ -26,8 +29,10 @@ ftp://%HOSTIP:%FTPPORT/120 -Q "-DELE file" USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I +SIZE 120 RETR 120 DELE file </protocol> diff --git a/tests/data/test121 b/tests/data/test121 index 3ac985c6aaff7ab7ebda0f7073fc60376c079926..c94b6262f0fa32c0304ec44a8bbc38314ffd781c 100644 --- a/tests/data/test121 +++ b/tests/data/test121 @@ -27,8 +27,9 @@ USER anonymous PASS curl_by_daniel@haxx.se PWD DELE before_transfer -PASV +EPSV TYPE I +SIZE 121 RETR 121 DELE after_transfer </protocol> diff --git a/tests/data/test122 b/tests/data/test122 index b9990d98221ce6044a3df4191e2926ff881b3d36..f1a481b1ba29edcf5c782b169275a08e09cd1821 100644 --- a/tests/data/test122 +++ b/tests/data/test122 @@ -13,6 +13,9 @@ FTP download resume with whole file already downloaded <command> ftp://%HOSTIP:%FTPPORT/122 -C 5 </command> +<file name="log/ftpserver.cmd"> +REPLY EPSV 500 no such command +</file> </test> # Verify data after the test has been "shot" @@ -21,6 +24,7 @@ ftp://%HOSTIP:%FTPPORT/122 -C 5 USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I SIZE 122 diff --git a/tests/data/test123 b/tests/data/test123 index c2e81646c518ff023140506354ec78d5282524b5..218548aa70cfe09ec0e9a46d3f9f838cf112d69b 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -21,7 +21,7 @@ ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51 USER anonymous PASS curl_by_daniel@haxx.se PWD -PASV +EPSV TYPE I </protocol> </verify> diff --git a/tests/data/test124 b/tests/data/test124 index 106291fd466afcdfd6704325fde991bdd5c7a8e4..6ae97b78027a1fe27e87ef133baa499181175345 100644 --- a/tests/data/test124 +++ b/tests/data/test124 @@ -15,6 +15,7 @@ ftp://%HOSTIP:%FTPPORT/124 </command> <file name="log/ftpserver.cmd"> REPLY PWD 314 bluah you f00l! +REPLY EPSV 314 bluah you f00l! </file> </test> @@ -24,8 +25,10 @@ REPLY PWD 314 bluah you f00l! USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE I +SIZE 124 RETR 124 </protocol> </verify> diff --git a/tests/data/test400 b/tests/data/test400 index 1159ee859600b0f156567265c23df1030115f0f4..2c118b83dc53accefab14bfb7993885cbbc4d82e 100644 --- a/tests/data/test400 +++ b/tests/data/test400 @@ -25,6 +25,9 @@ FTPS dir list PASV <command> ftps://%HOSTIP:%FTPSPORT/ </command> +<file name="log/ftpserver.cmd"> +REPLY EPSV 500 no such command +</file> </test> # @@ -37,6 +40,7 @@ filter off really nothing USER anonymous PASS curl_by_daniel@haxx.se PWD +EPSV PASV TYPE A LIST