merge branch 'stable'

This commit is contained in:
Michael Klishin 2017-01-31 18:21:27 +03:00
commit a0a19a4497
2 changed files with 6 additions and 1 deletions

View File

@ -102,7 +102,7 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre
dep_cowboy_commit = 1.0.4
dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2
dep_ranch_commit = 1.3.0
dep_ranch_commit = 1.3.1
dep_webmachine_commit = 1.10.8p2
RABBITMQ_COMPONENTS = amqp_client \

View File

@ -68,7 +68,12 @@ parse_table(<<>>) ->
?SIMPLE_PARSE_TABLE($d, Value:64/float, double);
?SIMPLE_PARSE_TABLE($f, Value:32/float, float);
%% yes, both 'l' and 'L' fields are decoded to 64-bit signed values;
%% see https://github.com/rabbitmq/rabbitmq-server/issues/1093#issuecomment-276351183,
%% http://www.rabbitmq.com/amqp-0-9-1-errata.html, and section
%% 4.2.1 of the spec for details.
?SIMPLE_PARSE_TABLE($l, Value:64/signed, long);
?SIMPLE_PARSE_TABLE($L, Value:64/signed, long);
parse_table(<<NLen:8/unsigned, NameString:NLen/binary,