generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl -z: do not write empty file on unmet condition

Browse Source 
This commit fixes a regression introduced in curl-7_41_0-186-g261a0fe.
It also introduces a regression test 1424 based on tests 78 and 1423.

Reported-by: Viktor Szakats
Bug: https://github.com/bagder/curl/issues/237
This commit is contained in:
Kamil Dudka 2015-04-23 14:01:08 +02:00 committed by Daniel Stenberg
parent c75c4d7706
commit 097460adb2
3 changed files with 88 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tool_operate.c
View File

@ -1388,12 +1388,17 @@ static CURLcode operate_do(struct GlobalConfig *global,
#endif #endif
result = curl_easy_perform(curl); result = curl_easy_perform(curl);
if(!result && !outs.stream && !outs.bytes if(!result && !outs.stream && !outs.bytes) {
/* we have received no data despite the transfer was successful /* we have received no data despite the transfer was successful
==> force cration of an empty output file (if an output file ==> force cration of an empty output file (if an output file
was specified) */ was specified) */
&& !tool_create_output_file(&outs)) long cond_unmet = 0L;
result = CURLE_WRITE_ERROR; /* do not create (or even overwrite) the file in case we get no
data because of unmet condition */
curl_easy_getinfo(curl, CURLINFO_CONDITION_UNMET, &cond_unmet);
if(!cond_unmet && !tool_create_output_file(&outs))
result = CURLE_WRITE_ERROR;
}
if(outs.is_cd_filename && outs.stream && !global->mute && if(outs.is_cd_filename && outs.stream && !global->mute &&
outs.filename) outs.filename)

2
tests/data/Makefile.inc
View File

@ -143,7 +143,7 @@ test1396 test1397 test1398 \
test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \ test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \ test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \
test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \ test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \
\ test1424 \
test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \ test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \
test1436 \ test1436 \
\ \

76
tests/data/test1424 Normal file
View File

@ -0,0 +1,76 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
If-Modified-Since
-z
</keywords>
</info>
#
# Server-side
<reply>
<data nocheck="yes">
HTTP/1.1 200 OK
Server: test-server/fake
Last-Modified: Tue, 13 Jun 1990 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>
<datacheck>
HTTP/1.1 200 OK
Server: test-server/fake
Last-Modified: Tue, 13 Jun 1990 12:10:00 GMT
ETag: "21025-dc7-39462498"
Accept-Ranges: bytes
Content-Length: 6
Connection: close
Content-Type: text/html
Funny-head: yesyes
</datacheck>
</reply>
#
# Client-side
<client>
<server>
http
</server>
<name>
HTTP GET -o fname without Content-Disposition (unmet time condition)
</name>
<file name="log/outfile1424">
original contents
</file>
<command option="no-output,no-include">
http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
</command>
</client>
#
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
GET /1424 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
</protocol>
<file1 name="log/outfile1424">
original contents
</file1>
</verify>
</testcase>