Merge bug24012 into default

merge default into bug24012

cosmetic

inlining

Small fix to avoid warning from erlang compiler.

Fixed bits/binary typo in private functions.

Apply patch to remove dependency on binary:split/2

Added tag rabbitmq_v2_4_0 for changeset 608231b4ce63

Merge in default. Not sure what was happening when I thought it didn't work.

Adust Makefile again to correctly build certs for ssl tests

Merged default into bug22005

Adapter info for STOMP. This is branched from 2.3.1 since default is not working for me ATM.

Correct Makefile to run ssl tests.

Merge bug23692 into default

Added skeleton ssl_listeners to the STOMP app file

Fixed bug with SSL socket setup. Added full SSL communication test

SSL connections largely working. Rough connection test

Rough outline for introducing SSL support

Merged Bug23847 into default.

Added check for explicit receipt-id on DISCONNECT in test.

Removed blank line in rabbit_stomp_processor.erl & merged Bug23718 into default.

Merging Bug23886 into default.

Fixed issue in adhoc_convert_headers when AMQP message contains no extra headers

Merge bug23721 into default

Fixed bug in receipt processing when interleaving receipt/no-receipt messages. Increased test coverage for receipts

Merge with default

Reworked tests to check the actual receipts

Merged in default.

Tidied parsing.py again to <=80 byte lines.

Merge bug23881 into default

Removed trailing spaces and tweaked some indentation

Changed README.md to point to the new documentation

Changed test to expect new message text.

Shortened some new lines in parsing.py.

Fix MESSAGE send frame body fragment assembly.

Merge default into bug23568

Merged in default.

Added test for packetizing on send;
added fix for packet end in escape sequence;
added get of trailing null with content length.

s/IN_BROKER/WITH_BROKER/

Merged Bug23853 into default.

Add erl_crash.dump to .hgignore

Added content with nulls tests to erlang unittests.

package_targets -> package_rules

Further fixes to test in parsing.py

Fix minor error in test for embedded nulls

Added test for embedded nulls in STOMP MESSAGE body.

Merged bug23527 into default

Add support for persistent header

DISCONNECT now triggers connection and channel shutdown. Receipts for DISCONNECT are sent after this has happenend

Rough work on DISCONNECT fixes

Fixed issue with multi-confirm and added support for TX receipts

Rename *_app.in to *.app

Working confirm-triggered receipts for non-transactional SEND

Enable confirms on the channel if receipt header is set in SEND

Merge default into bug23568

Merged in bug23527

Merge bug23801 into default

Merging into default.

Merging default.

Removed race in the tests

Merge default

Removed the enforced flush

Merge with default

Removed stray Makefile target

Merge bug23792 into default.

Formatting change again - as per request from Matthias

Line length and cosmetics

Update .hgignore

Expose configuration of stomp adapter tcp listeners to match broker

Ensure payload of amqp_msg() is binary, not list of binary.

Merge default into bug23568

Added tag rabbitmq_v2_3_1 for changeset b32a5e49434e

Added tag rabbitmq_v2_3_0 for changeset 73804b18fc64

Hook into the new rabbitmq-public-umbrella testing support

Merge default into bug23568

Merge bug23777 into default

Flush sometimes takes slightly longer than the default 5 seconds

rename

Rough approximation for periodic flushing

Switched to using the hibernate capability of gen_server2

Removed stray handle_info callback

Moved to gen_server2

Experimental move back to prim_inet to facilitate extremely experimental TCP backpressure

Merge default into bug23568

Reworked TCP send to use rabbit_net:port_command

cosmetic

Reworked header conversion - slightly faster and quite a bit nicer

Back out the use of prim_inet - explicit gen_tcp:recv is faster in the benchmarks

Switched to using prim_inet:async_recv

Changed how bytes are read from the socket - better performance for large messages

simplifying refactor and cosmetics

Merge with default

bug23154 (ipv6) merged into default

This is no longer needed.

Tweak to how we match binaries when using Content-Length

Added optimisation when reading bodies with Content-Length set

Merge bug23652 into default

Whitespace

Some parser tweaks

Whitespace

Reworked parser to use binaries

Merged default again.

Merged bug23651 into default

Reworked body content parsing

Put short delay into destinations test

Merged in default

UN/SUBSCRIBE error messages contain the subscription as passed in by the user.

Merged default (with 1.1 support) and got tests working again.

Fixed up bugs in new parser

Merge with default

ensure_subchannel_closed now used; merged fixes from 23651

Merge from default.

Merge bug 23447.

Remove unused patched-in function.

Added receipted unsubscribe tests and check for send after unsubscribe properly.

Remove code duplication.

SX, SY have meanings in the spec that are not the same as the meanings here. Rename.

Cosmetic

Merge with bug23447

Merge with default

Merge bug23601 into default

Merge with default

Merge in bug23601 fixes

Refactored lifecyclke tests

Added support for multi NACK

Fixed error during merge

Merge bug23685 into default

Merge bug23686 to default after QA

Cleaned up the stomppy patch, including whitespace fixes

Removed unnecessary refactoring to rabbit_stomp_reader:process_received_bytes/2

Removed unused ack_mode slot in session state

Factored out common function format_detail/2

Renamed explain_amqp_death to amqp_death

Added receipted unsubscribes to lifecycle test

Augnmented handle_info to allow basic.cancel_ok records;
tweaked base.py Latch class not to underflow count;
receipted tests in lifecycle check for receipts.

Tests and improvements for header value stripping, escaping and duplication

Exploratory rework of frame parser

Merged bug23601 into this branch

Added tests to check queue subscriptipn UNSUBSCRIBE

Augmented listener class (python) to allow debugging;
patch Latch, natch.

Added tests for unsubscribe from queue by destination and id

Reworked handling of AMQP errors so that the STOMP session is terminated too

Missing subscription tag does not terminate channel process.

error frame delivered instead of message frame;
test (lifecycle.py) updated to check for no errors at crucial points.

Added STOMP as an alias for CONNECT

Added support for NACK

restructured ACK code to extract the common parts for NACK

Removed stray debug line

Fixed issue with merge that broke version negotiation tests

Merge with default

Close subscription channels on UNSUBSCRIBE

Only do so if the channel is not the main channel;
only do so if the subscription cancel succeeds;
no check of failure of close is made;
no extra error message introduced.

Update documentation for tcp_listeners.

Merged default

Bind to all ports by default, and rename "listeners" to "tcp_listeners" for consistency with other protocols.

Merge default into bug23568

Update UNSUBSCRIBE to wait on cancel.

Added amqp_channel:call directly in cancel_subscription_channel.
Included error() with no change of State if cancel response not ok.
Removed send_method/3.

bug23601: changed UNSUBSCRIBE to cancel subscription from correct channel

Channel is created for each subscription (SUBSCRIBE) but main channel was used to cancel one (UNSUBSCRIBE).
This always fails unless the subscription is associated with the main channel (not likely).
Added cancel_subscription_channel/2 to rabbit_stomp_processor.erl called by handle_frame("UNSUBSCRIBE",...)
and added send_method/3 call to explicitly specify the channel on the amqp.call method.

Merge bug23477 into default.

Editorial from Steve

So I'm not sure how that worked, maybe there's some weird ::1 to 127.0.0.1 munging somewhere.

Updates for check_tcp_listener_address changes. IPv6 now works.

Removed DESIGN.md - it is not needed now

Rolled the important details from DESIGN.md into README.md

README updated, removing old instructions and reflecting new Ruby sample updates

Merge with default and updates to README

Reworked Ruby examples to allow more flexibility in the topic examples. Still need to document this

Merge bug23341 into default.

Make rabbit_stomp explicitly an application, remove start/0 and stop/0 that don't seem to be used anywhere.

Overhaul for bug23568

Merge from default

Added tag rabbitmq_v2_2_0 for changeset 328ce5ce874a

Reworked error identification and receipt handling. Receipts are now sent only on success

Backed out changeset 8f9ce5c24979 (reinstate FQ function names)

Cleaned up stray heartbeat stuff and set backlog tcpopt to 128 to handle more incoming connections

Fixed issue with arbitrary headers not being included in MESSAGE frames

Remove ?MODULE in front of directly-applied local functions

Port across the fix for bug23440, which was in rabbit_stomp_server.erl

Factor out the transport, so we can use an indirection for e.g., websockets.

Fixed whitespace error

Merge with remote

Fixed missing version header in CONNECTED frames

Reworked heartbeating to use the rabbit_heartbeat module

More patches against stomppy for the tests

Basic heartbeating for both server and client

tweaked test case to better exercise negotiation

test for prefetch with topics

Reworked ack handling to be inline with the 1.1 spec. Re-introduced the prefetch-count header to make ACK more useful

Version negotiation

Merge bug23341

Merged tiny bug fix that I missed earlier

Partially complete version negotiation

Utility for calculating the maximum version shared by the client and the server

Switched to using the host header as defined in the 1.1 spec

Removed stray io:format line

Updated the readme

Fixed the persistent sender example

fixed the perl RPC example

Fixed most of the samples. Other fixes require some consideration

Merged bug23440 into default

cosmetic: README is in markdown

cosmetic: avoid long lines

Fixed the .app file

Removed the old STOMP server code