From: Daniel Jelinski <daniel.jelinski@thomsonreuters.com>
Date: Mon, 30 Jul 2018 07:30:10 +0000 (+0200)
Subject: retry: return error if rewind was necessary but didn't happen
X-Git-Tag: curl-7_61_1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6cf93011d8f9962c763cab4e8aa975567f6ea69;p=thirdparty%2Fcurl.git

retry: return error if rewind was necessary but didn't happen

Fixes #2801
Closes #2812
---

diff --git a/lib/multi.c b/lib/multi.c
index 70a406078f..ee8be39714 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -1949,6 +1949,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
         CURLcode ret = Curl_retry_request(data->easy_conn, &newurl);
         if(!ret)
           retry = (newurl)?TRUE:FALSE;
+        else if(!result)
+          result = ret;
 
         if(retry) {
           /* if we are to retry, set the result to OK and consider the