Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #17 from basho/ku-range-fix

Ku range fix
  • Loading branch information...
commit ade2a9b29a11034eb550c1d79b4f991bf5ca05ba 2 parents bff08e8 + ce93cfa
@kuenishi kuenishi authored
Showing with 5 additions and 4 deletions.
  1. +5 −4 src/mochiweb_http.erl
View
9 src/mochiweb_http.erl
@@ -153,8 +153,6 @@ after_response(Body, Req) ->
?MODULE:loop(Socket, Body)
end.
-parse_range_request("bytes=0-") ->
- undefined;
parse_range_request(RawRange) when is_list(RawRange) ->
try
"bytes=" ++ RangeString = RawRange,
@@ -188,7 +186,7 @@ range_skip_length(Spec, Size) ->
invalid_range;
{Start, End} when 0 =< Start, Start =< End, End < Size ->
{Start, End - Start + 1};
- {Start, End} when 0 =< Start, Start =< End, End >= Size ->
+ {Start, End} when 0 =< Start, Start < Size, Start =< End ->
{Start, Size - Start};
{_OutOfRange, _End} ->
invalid_range
@@ -207,7 +205,7 @@ range_test() ->
?assertEqual([{none, 20}], parse_range_request("bytes=-20")),
%% trivial single range
- ?assertEqual(undefined, parse_range_request("bytes=0-")),
+ ?assertEqual([{0, none}], parse_range_request("bytes=0-")),
%% invalid, single ranges
?assertEqual(fail, parse_range_request("")),
@@ -254,6 +252,7 @@ range_skip_length_test() ->
?assertEqual({BodySize, 0}, range_skip_length({none, 0}, BodySize)),
?assertEqual({0, BodySize}, range_skip_length({none, BodySize}, BodySize)),
?assertEqual({0, BodySize}, range_skip_length({0, none}, BodySize)),
+ ?assertEqual({0, BodySize}, range_skip_length({0, BodySize + 1}, BodySize)),
BodySizeLess1 = BodySize - 1,
?assertEqual({BodySizeLess1, 1},
range_skip_length({BodySize - 1, none}, BodySize)),
@@ -281,6 +280,8 @@ range_skip_length_test() ->
range_skip_length({-1, none}, BodySize)),
?assertEqual(invalid_range,
range_skip_length({BodySize, none}, BodySize)),
+ ?assertEqual(invalid_range,
+ range_skip_length({BodySize + 1, BodySize + 5}, BodySize)),
ok.
-endif.
Please sign in to comment.
Something went wrong with that request. Please try again.