- The libcurl FTP code now returns CURLE_REMOTE_FILE_NOT_FOUND error when SIZE

  gets a 550 response back for the cases where a download (or NOBODY) is
  wanted. It still allows a 550 as response if the SIZE is used as part of an
  upload process (like if resuming an upload is requested and the file isn't
  there before the upload). I also modified the FTP test server and a few test
  cases accordingly to match this modified behavior.

4 files changed, 3 insertions, 6 deletions

diff --git a/tests/data/test118 b/tests/data/test118
index 6cd086ca2..b2b10c235 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -9,6 +9,9 @@ FAILURE
 </info>
 # Server-side
 <reply>
+<size>
+1
+</size>
 <servercmd>
 REPLY RETR 314 bluah you f00l!
 REPLY EPSV 314 bluah you f00l!
diff --git a/tests/data/test533 b/tests/data/test533
index f4446cbe0..a7a57b9a7 100644
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -45,10 +45,8 @@ CWD path
 EPSV

 TYPE I

 SIZE 533

-RETR 533

 EPSV

 SIZE 533

-RETR 533

 QUIT

 </protocol>
 </verify>
diff --git a/tests/data/test534 b/tests/data/test534
index 52bb1e260..1f02df551 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -45,7 +45,6 @@ CWD path
 EPSV

 TYPE I

 SIZE 534

-RETR 534

 QUIT

 </protocol>
 </verify>
diff --git a/tests/data/test546 b/tests/data/test546
index 1dd1cd41e..415848792 100644
--- a/tests/data/test546
+++ b/tests/data/test546
@@ -19,8 +19,6 @@ works
 </data>
 
 <servercmd>
-REPLY RETR 550 the file doesn't exist
-COUNT RETR 1
 REPLY SIZE 550 Can't check for file existence
 COUNT SIZE 1
 </servercmd>
@@ -52,7 +50,6 @@ CWD path
 EPSV

 TYPE I

 SIZE 546

-RETR 546

 EPSV

 SIZE 546

 RETR 546