From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 5 Sep 2020 13:46:55 +0000 (+0200)
Subject: curl: in retry output don't call all problems "transient"
X-Git-Tag: curl-7_73_0~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ecb63e493fd64855961758ca1b448d03f59a16b;p=thirdparty%2Fcurl.git

curl: in retry output don't call all problems "transient"

... because when --retry-all-errors is used, the error isn't necessarily
transient at all.

Closes #5916
---

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 517ad1f620..39200dcd2e 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -512,10 +512,10 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
       static const char * const m[]={
         NULL,
         "(retrying all errors)",
-        "timeout",
-        "connection refused",
-        "HTTP error",
-        "FTP error"
+        ": timeout",
+        ": connection refused",
+        ": HTTP error",
+        ": FTP error"
       };
 
       sleeptime = per->retry_sleep;
@@ -529,7 +529,7 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
             sleeptime = (long)retry_after * 1000; /* milliseconds */
         }
       }
-      warnf(config->global, "Transient problem: %s "
+      warnf(config->global, "Problem %s. "
             "Will retry in %ld seconds. "
             "%ld retries left.\n",
             m[retry], sleeptime/1000L, per->retry_numretries);