summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-06-22 17:49:54 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-06-22 17:49:54 +0100
commit405d275e4e0c6db3f9d56a45f239c2fb284600d4 (patch)
tree112524e7b028789c5b5829b14b6c93a0711801af
parenta40971e3b11cd5a1b076ccfd4b2efc2400637f5c (diff)
downloadrabbitmq-server-405d275e4e0c6db3f9d56a45f239c2fb284600d4.tar.gz
Don't use protocol_error as we will not send one and mistuned does not exist anyway.
-rw-r--r--src/rabbit_reader.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 6cee27df..939efbbd 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -622,14 +622,13 @@ handle_method0(#'connection.tune_ok'{channel_max = _ChannelMax,
sock = Sock}) ->
if (FrameMax =< ?FRAME_MIN_SIZE) or
(?FRAME_MAX /= 0) and (FrameMax > ?FRAME_MAX) ->
- rabbit_misc:protocol_error(
- mistuned, "peer sent tune_ok with invalid frame_max", []);
+ exit(peer_sent_tune_ok_with_invalid_frame_max);
+ %% If we have a channel_max limit that the client wishes to
%% If we have a channel_max limit that the client wishes to
%% exceed, die as per spec. Not currently a problem, so we ignore
%% the client's channel_max parameter.
%%(?CHANNEL_MAX /= 0) and (ChannelMax > ?CHANNEL_MAX) ->
- %% rabbit_misc:protocol_error(
- %% mistuned, "peer sent tune_ok with invalid channel_max");
+ %% exit(peer_sent_tune_ok_with_invalid_channel_max);
true ->
rabbit_heartbeat:start_heartbeat(Sock, ClientHeartbeat),
State#v1{connection_state = opening,