romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 05:23:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

http resume: skip body if http code 416 (range error) is ignored.

Browse source 
This avoids appending error data to already existing good data.

Test 92 is updated to match this change.
New test 1156 checks all combinations of --range/--resume, --fail,
Content-Range header and http status code 200/416.

Fixes #1163
Reported-By: Ithubg on github
Closes #2578
This commit is contained in:
Patrick Monnerat 2018-05-22 13:23:02 +02:00
parent 2e65a92052
commit 09d16af49a
6 changed files with 262 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/Makefile.inc
View file

@ -127,7 +127,7 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \
test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
test1152 test1153 test1154 test1155 \
test1152 test1153 test1154 test1155 test1156 \
\
test1160 test1161 test1162 test1163 test1164 \
test1170 test1171 \

70
tests/data/test1156 Normal file
View file

@ -0,0 +1,70 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
Content-Range
Resume
Range
</keywords>
</info>
# Server-side
<reply>
<data nocheck="yes">
HTTP/1.1 200 OK
Content-Type: text/html
Content-Length: 5
body
</data>
<data1 nocheck="yes">
HTTP/1.1 200 OK
Content-Type: text/html
Content-Length: 5
Content-Range: bytes 3/7
body
</data1>
<data2 nocheck="yes">
HTTP/1.1 416 Requested Range Not Satisfiable
Content-Type: text/html
Content-Length: 5
body
</data2>
<data3 nocheck="yes">
HTTP/1.1 416 Requested Range Not Satisfiable
Content-Type: text/html
Content-Length: 5
Content-Range: bytes */2
body
</data3>
</reply>
# Client-side
<client>
<server>
http
</server>
<tool>
lib1156
</tool>
<name>
HTTP resume/range fail range-error content-range combinations
</name>
<command>
http://%HOSTIP:%HTTPPORT/want/1156
</command>
</client>
# Verify data after the test has been "shot"
<verify>
<errorcode>
0
</errorcode>
</testcase>

14
tests/data/test92
View file

@ -23,6 +23,20 @@ Content-Type: image/gif
bad
</data>
# The body should be ignored.
<datacheck>
HTTP/1.1 416 Requested Range Not Satisfiable
Date: Fri, 24 Oct 2003 21:33:12 GMT
Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
ETag: "ab57a-507-3f9968f3"
Accept-Ranges: bytes
Content-Length: 4
Content-Range: bytes */87
Content-Type: image/gif
</datacheck>
</reply>
# Client-side