Commit 464a019c authored by Stefan Agner's avatar Stefan Agner Committed by Jay Satiro
Browse files

tool_operate: Fix retry on FTP 4xx to ignore other protocols 

Only treat response code as FTP response codes in case the
protocol type is FTP.

This fixes an issue where an HTTP download was treated as FTP
in case libcurl returned with 33. This happens when the
download has already finished and the server responses 416:
  HTTP/1.1 416 Requested Range Not Satisfiable

This should not be treated as an FTP error.

Fixes #2464
Closes #2465
parent dd03e8c2

src/tool_operate.c

+5 −1
Original line number Diff line number Diff line
@@ -1570,9 +1570,13 @@ static CURLcode operate_do(struct GlobalConfig *global, 
              }

            } /* if CURLE_OK */

            else if(result) {

              long protocol;



              curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response);

              curl_easy_getinfo(curl, CURLINFO_PROTOCOL, &protocol);



              if(response/100 == 4)

              if((protocol == CURLPROTO_FTP || protocol == CURLPROTO_FTPS) &&

                 response / 100 == 4)

                /*

                 * This is typically when the FTP server only allows a certain

                 * amount of users and we are not one of them.  All 4xx codes