Commit ffb11ad5 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Don't tear down the ftp connection if the maximum filesize was exceeded 

and added tests 290 and 291 to check.
parent fbb1e492

CHANGES

+9 −0
Original line number Diff line number Diff line
@@ -6,6 +6,15 @@ 


                                  Changelog



Dan F (29 March 2007)

- Don't tear down the ftp connection if the maximum filesize was exceeded

  and added tests 290 and 291 to check.



- Added ftps upload and SSL required tests 401 and 402.



- Send an EOF message before closing an SCP channel, as recommended by

  RFC4254. Enable libssh2 tracing when ssh debugging is turned on.



Yang Tse (27 March 2007)

- Internal function Curl_select() renamed to Curl_socket_ready()

lib/ftp.c

+1 −0
Original line number Diff line number Diff line
@@ -3020,6 +3020,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn, CURLcode status, bool premature 
  case CURLE_FTP_COULDNT_RETR_FILE:

  case CURLE_FTP_COULDNT_STOR_FILE:

  case CURLE_FTP_ACCESS_DENIED:

  case CURLE_FILESIZE_EXCEEDED:

    /* the connection stays alive fine even though this happened */

    /* fall-through */

  case CURLE_OK: /* doesn't affect the control connection's status */

tests/data/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -38,4 +38,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ 
 test530 DISABLED test278 test279 test531 test280 test529 test532 test533  \

 test534 test535 test281 test537 test282 test283 test284 test538 test285   \

 test286 test307 test308 test287 test400 test288 test600 test601 test602   \

 test603 test401 test402
 
 test603 test401 test402 test290 test291

tests/data/test283

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
<keywords>

TFTP

TFTP RRQ

FAILURE

</keywords>

</info>

tests/data/test290

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

FTP

--max-filesize

</keywords>

</info>

# Server-side

<reply>

<size>

85

</size>

</reply>



# Client-side

<client>

<server>

ftp

</server>

 <name>

FTP download maximum filesize exceeded

 </name>

 <command>

ftp://%HOSTIP:%FTPPORT/290 --max-filesize 30

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<errorcode>

63

</errorcode>

<strip>

</strip>

<protocol>

USER anonymous

PASS ftp@example.com

PWD

EPSV

TYPE I

SIZE 290

QUIT

</protocol>

</verify>

</testcase>