moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

FTP: CURLE_PARTIAL_FILE should not cause control connection to be closed

Browse Source 
Test 161 updated accordingly
This commit is contained in:
gsengun 2012-01-07 23:13:57 +02:00 committed by Daniel Stenberg
parent 2705af6267
commit d28411c3cc
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ftp.c
View File

@ -3287,6 +3287,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status,
case CURLE_FTP_ACCEPT_TIMEOUT: case CURLE_FTP_ACCEPT_TIMEOUT:
case CURLE_FTP_COULDNT_SET_TYPE: case CURLE_FTP_COULDNT_SET_TYPE:
case CURLE_FTP_COULDNT_RETR_FILE: case CURLE_FTP_COULDNT_RETR_FILE:
case CURLE_PARTIAL_FILE:
case CURLE_UPLOAD_FAILED: case CURLE_UPLOAD_FAILED:
case CURLE_REMOTE_ACCESS_DENIED: case CURLE_REMOTE_ACCESS_DENIED:
case CURLE_FILESIZE_EXCEEDED: case CURLE_FILESIZE_EXCEEDED:

12
tests/data/test161
View File

@ -1,5 +1,12 @@
<testcase> <testcase>
# Server-side <info>
<keywords>
FTP
CURLE_PARTIAL_FILE
RETR
PASV
</keywords>
</info>
<reply> <reply>
<data> <data>
1oooooooooooooooooooooooooooooooooooooooooo2 1oooooooooooooooooooooooooooooooooooooooooo2
@ -25,6 +32,8 @@ ftp://%HOSTIP:%FTPPORT/161
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
# This gets QUIT sent because CURLE_PARTIAL_FILE does NOT mark the control
# connection as bad
<protocol> <protocol>
USER anonymous USER anonymous
PASS ftp@example.com PASS ftp@example.com
@ -33,6 +42,7 @@ EPSV
TYPE I TYPE I
SIZE 161 SIZE 161
RETR 161 RETR 161
QUIT
</protocol> </protocol>
<errorcode> <errorcode>
18 18