moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

tool_operate: don't discard failed parallel transfer result 

- Save a parallel transfer's result code only when it fails and the
  transfer is not being retried.

Prior to this change the result code was always set which meant that a
failed result could be erroneously discarded if a different transfer
later had a successful result (CURLE_OK).

Before:

> curl --fail -Z https://httpbin.org/status/404 https://httpbin.org/delay/10
> echo %ERRORLEVEL%
0

After:

> curl --fail -Z https://httpbin.org/status/404 https://httpbin.org/delay/10
> echo %ERRORLEVEL%
22

Closes #xxxx
This commit is contained in:
Jay Satiro 2021-04-20 01:51:56 -04:00
parent 6e3f2febcb
commit 711879ca7c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tool_operate.c
View File

@ -2294,11 +2294,11 @@ static CURLcode parallel_transfers(struct GlobalConfig *global,
long delay;
struct per_transfer *ended;
CURL *easy = msg->easy_handle;
result = msg->data.result;
CURLcode tres = msg->data.result;
curl_easy_getinfo(easy, CURLINFO_PRIVATE, (void *)&ended);
curl_multi_remove_handle(multi, easy);
result = post_per_transfer(global, ended, result, &retry, &delay);
tres = post_per_transfer(global, ended, tres, &retry, &delay);
progress_finalize(ended); /* before it goes away */
all_added--; /* one fewer added */
checkmore = TRUE;
@ -2307,8 +2307,11 @@ static CURLcode parallel_transfers(struct GlobalConfig *global,
/* we delay retries in full integer seconds only */
ended->startat = delay ? time(NULL) + delay/1000 : 0;
}
else
else {
if(tres)
result = tres;
(void)del_per_transfer(ended);
}
}
} while(msg);
if(!checkmore) {
@ -2320,9 +2323,11 @@ static CURLcode parallel_transfers(struct GlobalConfig *global,
}
if(checkmore) {
/* one or more transfers completed, add more! */
(void)add_parallel_transfers(global, multi, share,
&more_transfers,
&added_transfers);
CURLcode tres = add_parallel_transfers(global, multi, share,
&more_transfers,
&added_transfers);
if(tres)
result = tres;
if(added_transfers)
/* we added new ones, make sure the loop doesn't exit yet */
still_running = 1;