From: Stefan Agner <stefan@agner.ch>
Date: Fri, 6 Apr 2018 19:00:02 +0000 (+0200)
Subject: tool_operate: Fix retry on FTP 4xx to ignore other protocols
X-Git-Tag: curl-7_60_0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=464a019cbe028f1e0a85a6bd4631e41411b0d32d;p=thirdparty%2Fcurl.git

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
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 0aad542826..8eac65d6a3 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -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