diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-25 14:41:09 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-25 14:41:09 +0000 |
| commit | c5278e21223d8ad7af73d3b73240435019822635 (patch) | |
| tree | 2c169fb83a599b8b8fd5cdbfc7a18e26286256f7 /include | |
| parent | 55f5c2a8fdb5d243ffb7414faf84c1626da80c87 (diff) | |
| parent | 96f8ba03363b077cfe7cb5169f73c0e54ce5f26a (diff) | |
| download | rabbitmq-server-git-c5278e21223d8ad7af73d3b73240435019822635.tar.gz | |
Merge bug23076 (preventing bad_arg error in rabbit_event during shutdown)
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 8 | ||||
| -rw-r--r-- | include/rabbit_auth_mechanism_spec.hrl | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 15f5d7c5b0..b9a01735b3 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -28,7 +28,7 @@ -record(vhost, {virtual_host, dummy}). -record(connection, {protocol, user, timeout_sec, frame_max, vhost, - client_properties}). + client_properties, capabilities}). -record(content, {class_id, @@ -54,6 +54,12 @@ -record(binding, {source, key, destination, args = []}). -record(reverse_binding, {destination, key, source, args = []}). +-record(topic_trie_edge, {trie_edge, node_id}). +-record(topic_trie_binding, {trie_binding, value = const}). + +-record(trie_edge, {exchange_name, node_id, word}). +-record(trie_binding, {exchange_name, node_id, destination}). + -record(listener, {node, protocol, host, ip_address, port}). -record(basic_message, {exchange_name, routing_key, content, guid, diff --git a/include/rabbit_auth_mechanism_spec.hrl b/include/rabbit_auth_mechanism_spec.hrl index 49614d5f9c..614a3eed07 100644 --- a/include/rabbit_auth_mechanism_spec.hrl +++ b/include/rabbit_auth_mechanism_spec.hrl @@ -17,6 +17,7 @@ -ifdef(use_specs). -spec(description/0 :: () -> [{atom(), any()}]). +-spec(should_offer/1 :: (rabbit_net:socket()) -> boolean()). -spec(init/1 :: (rabbit_net:socket()) -> any()). -spec(handle_response/2 :: (binary(), any()) -> {'ok', rabbit_types:user()} | |