diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-06-23 11:44:37 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-06-23 11:44:37 +0100 |
| commit | 92127450995d66e2ba90aea45b967c33982786d2 (patch) | |
| tree | 4b64944a4ff212054f3f3a7e9c88599419f72e5c | |
| parent | bbf0194ae40193970d34e849419dcdaabb071ecc (diff) | |
| download | rabbitmq-server-git-92127450995d66e2ba90aea45b967c33982786d2.tar.gz | |
Reinstate channel_max check.
| -rw-r--r-- | src/rabbit_reader.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 14f790ec38..e8198fbfae 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -614,7 +614,7 @@ handle_method0(#'connection.start_ok'{mechanism = Mechanism, connection = Connection#connection{ user = User, client_properties = ClientProperties}}; -handle_method0(#'connection.tune_ok'{channel_max = _ChannelMax, +handle_method0(#'connection.tune_ok'{channel_max = ChannelMax, frame_max = FrameMax, heartbeat = ClientHeartbeat}, State = #v1{connection_state = tuning, @@ -624,6 +624,9 @@ handle_method0(#'connection.tune_ok'{channel_max = _ChannelMax, (?FRAME_MAX /= 0) and (FrameMax > ?FRAME_MAX) -> rabbit_misc:protocol_error( not_allowed, "invalid frame_max", []); + (?CHANNEL_MAX /= 0) and (ChannelMax > ?CHANNEL_MAX) -> + rabbit_misc:protocol_error( + not_allowed, "invalid channel_max", []); true -> rabbit_heartbeat:start_heartbeat(Sock, ClientHeartbeat), State#v1{connection_state = opening, |