romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 15:03:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl tool: don't abort glob-loop due to failures

Browse source 
We want to continue to the next URL to try even on failures returned
from libcurl. This makes -f with ranges still get subsequent URLs even
if occasional ones return error. This was a regression as it used to
work and broke in the 7.23.0 release.

Added test case 1328 to verify the fix.

Bug: http://curl.haxx.se/bug/view.cgi?id=3481223
Reported by: Juan Barreto
This commit is contained in:
Daniel Stenberg 2012-02-06 10:46:25 +01:00
parent 466150bc64
commit 65103efe49
3 changed files with 75 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tool_operate.c
View file

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -384,7 +384,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
URLGlob *inglob;
outfiles = NULL;
infilenum = 0;
infilenum = 1;
inglob = NULL;
/* urlnode->url is the full URL (it might be NULL) */
@ -422,7 +422,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
/* Here's the loop for uploading multiple files within the same
single globbed string. If no upload, we enter the loop once anyway. */
for(up = 0 ;; up++) {
for(up = 0 ; up < infilenum; up++) {
char *uploadfile; /* a single file, never a glob */
int separator;
@ -472,7 +472,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
separator= ((!outfiles || curlx_strequal(outfiles, "-")) && urlnum > 1);
/* Here's looping around each globbed URL */
for(i = 0 ;; i++) {
for(i = 0 ; i < urlnum; i++) {
int infd;
bool infdopen;
@ -1463,10 +1463,6 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
infd = STDIN_FILENO;
}
/* upon error exit loop */
if(res)
break;
} /* loop to the next URL */
/* Free loop-local allocated memory */
@ -1479,10 +1475,6 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
urls = NULL;
}
/* upon error exit loop */
if(res)
break;
} /* loop to the next globbed upload file */
/* Free loop-local allocated memory */