diff options
| -rw-r--r-- | src/tool_operate.c | 16 | ||||
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test1328 | 70 |
3 files changed, 75 insertions, 13 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index a6f6f0b90..d086ac50a 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -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 */ diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 610243c24..a9391c702 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -82,7 +82,7 @@ test1220 \ test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \ -test1322 test1323 test1324 test1325 test1326 test1327 \ +test1322 test1323 test1324 test1325 test1326 test1327 test1328 \ test2000 test2001 test2002 test2003 test2004 EXTRA_DIST = $(TESTCASES) DISABLED diff --git a/tests/data/test1328 b/tests/data/test1328 new file mode 100644 index 000000000..c3991ecb4 --- /dev/null +++ b/tests/data/test1328 @@ -0,0 +1,70 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +-f +</keywords> +</info> + +<reply> +<data> +HTTP/1.1 404 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Funny-head: yesyes + +-noo- +</data> +<data1> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Funny-head: yesyes + +-yes- +</data1> +<datacheck> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Content-Length: 6 +Connection: close +Funny-head: yesyes + +-yes- +</datacheck> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +HTTP GET a globbed range with -f + </name> + <command> +-f 'http://%HOSTIP:%HTTPPORT/[13280000-13280001]' -o log/#1 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /13280000 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /13280001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +</verify> +</testcase> |