diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2021-04-26 14:38:43 +0200 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2021-04-26 14:38:43 +0200 |
| commit | f5341878bc713ff81a33aa0c7e0dc60f80926ee3 (patch) | |
| tree | 72907a62538cc91b02cdb388ab76c555da438eea | |
| parent | 065b92114dce48acd41dbfb4f5bbeba1bf322951 (diff) | |
| download | rabbitmq-server-git-stomp-for-streams.tar.gz | |
Use = separator for stream offset STOMPstomp-for-streams
For offset (e.g. offset=5000) and timestamp (timetamp=5000).
It was ":" before, but this is already the separator for key/value
in STOMP headers. This was actually working with the client used
to test, but other clients may get confused.
References #3002.
| -rw-r--r-- | deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl | 8 | ||||
| -rw-r--r-- | deps/rabbitmq_stomp/test/frame_SUITE.erl | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl index 20a8de392a..374549ada6 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_frame.erl @@ -224,10 +224,6 @@ binary_header(F, K) -> binary_header(F, K, D) -> default_value(binary_header(F, K), D). stream_offset_header(F, D) -> - OffsetPrefix = <<"offset:">>, - OffsetPrefixLength = byte_size(OffsetPrefix), - TimestampPrefix = <<"timestamp:">>, - TimestampPrefixLength = byte_size(TimestampPrefix), case binary_header(F, ?HEADER_X_STREAM_OFFSET, D) of <<"first">> -> {longstr, <<"first">>}; @@ -235,9 +231,9 @@ stream_offset_header(F, D) -> {longstr, <<"last">>}; <<"next">> -> {longstr, <<"next">>}; - <<OffsetPrefix:OffsetPrefixLength/binary, OffsetValue/binary>> -> + <<"offset=", OffsetValue/binary>> -> {long, binary_to_integer(OffsetValue)}; - <<TimestampPrefix:TimestampPrefixLength/binary, TimestampValue/binary>> -> + <<"timestamp=", TimestampValue/binary>> -> {timestamp, binary_to_integer(TimestampValue)}; _ -> D diff --git a/deps/rabbitmq_stomp/test/frame_SUITE.erl b/deps/rabbitmq_stomp/test/frame_SUITE.erl index d74a118942..93f21c22ee 100644 --- a/deps/rabbitmq_stomp/test/frame_SUITE.erl +++ b/deps/rabbitmq_stomp/test/frame_SUITE.erl @@ -168,8 +168,8 @@ stream_offset_header(_) -> {{"x-stream-offset", "first"}, {longstr, <<"first">>}}, {{"x-stream-offset", "last"}, {longstr, <<"last">>}}, {{"x-stream-offset", "next"}, {longstr, <<"next">>}}, - {{"x-stream-offset", "offset:5000"}, {long, 5000}}, - {{"x-stream-offset", "timestamp:1000"}, {timestamp, 1000}}, + {{"x-stream-offset", "offset=5000"}, {long, 5000}}, + {{"x-stream-offset", "timestamp=1000"}, {timestamp, 1000}}, {{"x-stream-offset", "foo"}, undefined}, {{"some-header", "some value"}, undefined} ], |