root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Tweak to how we match binaries when using Content-Length

This commit is contained in:
Rob Harrop 2011-01-20 15:28:56 +00:00
parent 3c656db0b6
commit 13f3658488
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl vendored
View File

@ -121,7 +121,7 @@ parse_body(Content, Frame, Chunks, unknown) ->
end;
parse_body(Content, Frame, Chunks, Remaining) ->
Size = byte_size(Content),
case Remaining > Size of
case Remaining >= Size of
true ->
more(fun(Rest) ->
parse_body(Rest, Frame,
@ -129,19 +129,13 @@ parse_body(Content, Frame, Chunks, Remaining) ->
Remaining - Size)
end);
false ->
Chunk = binary:part(Content, 0, Remaining),
Remainder = binary:part(Content, Remaining,
byte_size(Content) - Remaining),
terminate_body(Remainder, Frame, finalize_chunk(Chunk, Chunks))
<<Chunk:Remaining/binary, 0, Remainder/binary>> = Content,
{ok,
Frame#stomp_frame{
body_iolist = lists:reverse(finalize_chunk(Chunk, Chunks))},
Remainder}
end.
terminate_body(<<>>, Frame, Chunks) ->
more(fun(Rest) -> terminate_body(Rest, Frame, Chunks) end);
terminate_body(<<0, Rest/binary>>, Frame, Chunks) ->
{ok, Frame#stomp_frame{body_iolist = lists:reverse(Chunks)}, Rest};
terminate_body(_, _, _) ->
{error, missing_body_terminator}.
finalize_chunk(Chunk, Chunks) ->
case Chunk of
<<>> -> Chunks;