diff options
| -rw-r--r-- | src/tool_operate.c | 15 | ||||
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test490 | 68 | ||||
| -rw-r--r-- | tests/data/test491 | 64 | ||||
| -rw-r--r-- | tests/data/test492 | 89 |
5 files changed, 232 insertions, 6 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index 3087d2d14..4ecb1ed5f 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -829,12 +829,6 @@ static CURLcode single_transfer(struct GlobalConfig *global, separator = ((!state->outfiles || !strcmp(state->outfiles, "-")) && urlnum > 1); - /* Here's looping around each globbed URL */ - - if(state->li >= urlnum) { - state->li = 0; - state->up++; - } if(state->up < state->infilenum) { struct per_transfer *per; struct OutStruct *outs; @@ -1908,6 +1902,15 @@ static CURLcode single_transfer(struct GlobalConfig *global, per->retrystart = tvnow(); state->li++; + /* Here's looping around each globbed URL */ + if(state->li >= urlnum) { + state->li = 0; + state->urlnum = 0; /* forced reglob of URLs */ + glob_cleanup(state->urls); + state->urls = NULL; + state->up++; + Curl_safefree(state->uploadfile); /* clear it to get the next */ + } } else { /* Free this URL node data without destroying the diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 557f92891..212900ee5 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -66,6 +66,8 @@ test393 test394 test395 \ test400 test401 test402 test403 test404 test405 test406 test407 test408 \ test409 \ \ +test490 test491 test492 \ +\ test500 test501 test502 test503 test504 test505 test506 test507 test508 \ test509 test510 test511 test512 test513 test514 test515 test516 test517 \ test518 test519 test520 test521 test522 test523 test524 test525 test526 \ diff --git a/tests/data/test490 b/tests/data/test490 new file mode 100644 index 000000000..a3383a9d1 --- /dev/null +++ b/tests/data/test490 @@ -0,0 +1,68 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP PUT +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +Two globbed HTTP PUTs + </name> + <command> +http://%HOSTIP:%HTTPPORT/490 -T '{log/in490,log/in490}' +</command> +<file name="log/in490"> +surprise! +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +PUT /490 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Content-Length: 10
+Expect: 100-continue
+
+surprise! +PUT /490 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Content-Length: 10
+Expect: 100-continue
+
+surprise! +</protocol> +</verify> +</testcase> diff --git a/tests/data/test491 b/tests/data/test491 new file mode 100644 index 000000000..b49c06ce7 --- /dev/null +++ b/tests/data/test491 @@ -0,0 +1,64 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP PUT +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +Two globbed HTTP PUTs, the second upload file is missing + </name> + <command> +http://%HOSTIP:%HTTPPORT/491 -T '{log/in491,log/bad491}' +</command> +<file name="log/in491"> +surprise! +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +PUT /491 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Content-Length: 10
+Expect: 100-continue
+
+surprise! +</protocol> +<errorcode> +26 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test492 b/tests/data/test492 new file mode 100644 index 000000000..12edd8bc0 --- /dev/null +++ b/tests/data/test492 @@ -0,0 +1,89 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP PUT +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- +</data> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +Two globbed HTTP PUTs to two globbed URLs + </name> + <command> +'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first492,log/second492}' -H "Testno: 492" +</command> +<file name="log/first492"> +first 492 contents +</file> +<file1 name="log/second492"> +second 492 contents +</file1> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +PUT /one/first492 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Testno: 492
+Content-Length: 19
+Expect: 100-continue
+
+first 492 contents +PUT /two/first492 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Testno: 492
+Content-Length: 19
+Expect: 100-continue
+
+first 492 contents +PUT /one/second492 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Testno: 492
+Content-Length: 20
+Expect: 100-continue
+
+second 492 contents +PUT /two/second492 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Testno: 492
+Content-Length: 20
+Expect: 100-continue
+
+second 492 contents +</protocol> +</verify> +</testcase> |