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

merge default into bug24968

This commit is contained in:
Matthias Radestock 2012-05-28 17:36:29 +01:00
parent 254abae002 362e23d76c
commit 4878fcf885
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,11 +96,8 @@ parse_header_value_escape(<<Ch:8, Rest/binary>>, Frame,
parse_body(Content, Frame, Chunks, unknown) ->
case firstnull(Content) of
-1 -> more(fun(Rest) ->
parse_body(Rest, Frame,
finalize_chunk(Content, Chunks),
unknown)
end);
-1 -> Chunks1 = finalize_chunk(Content, Chunks),
more(fun(Rest) -> parse_body(Rest, Frame, Chunks1, unknown) end);
Pos -> <<Chunk:Pos/binary, 0, Rest/binary>> = Content,
Body = lists:reverse(finalize_chunk(Chunk, Chunks)),
{ok, Frame#stomp_frame{body_iolist = Body}, Rest}
@ -108,12 +105,9 @@ parse_body(Content, Frame, Chunks, unknown) ->
parse_body(Content, Frame, Chunks, Remaining) ->
Size = byte_size(Content),
case Remaining >= Size of
true -> Left = Remaining - Size,
more(fun(Rest) ->
parse_body(Rest, Frame,
finalize_chunk(Content, Chunks),
Left)
end);
true -> Chunks1 = finalize_chunk(Content, Chunks),
Left = Remaining - Size,
more(fun(Rest) -> parse_body(Rest, Frame, Chunks1, Left) end);
false -> <<Chunk:Remaining/binary, 0, Remainder/binary>> = Content,
Body = lists:reverse(finalize_chunk(Chunk, Chunks)),
{ok, Frame#stomp_frame{body_iolist = Body}, Remainder}