summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2013-11-26 16:02:44 +0400
committerMichael Klishin <michael@rabbitmq.com>2013-11-26 16:02:44 +0400
commit304757182980764a3739ce20cfc36d52cb29958b (patch)
tree1094f3c9c1a0ba99fe2682d4a8d64d2a4745be66
parentcefce1d5dc3821943673fbbdbc98ca26adfe7437 (diff)
downloadrabbitmq-server-git-304757182980764a3739ce20cfc36d52cb29958b.tar.gz
Don't send connection.close when connection.tune negotiation fails
This keeps us spec-compliant. It only happens with bogus clients and there will be a sensible error message in the log. Per discussion with Simon.
-rw-r--r--src/rabbit_reader.erl4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 59b4fec182..1600b6809e 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -933,7 +933,6 @@ validate_negotiated_integer_value(Field, ClientValue, ServerValue, Min,
fail_negotiation(Field, ClientValue,
ServerValue, MinOrMax,
State = #v1{sock = Sock, connection = Connection}) ->
- Protocol = Connection#connection.protocol,
S1 = case MinOrMax of
min -> lower;
max -> greater
@@ -946,9 +945,6 @@ fail_negotiation(Field, ClientValue,
not_allowed,
"negotiated ~p = ~w is ~p than the ~p allowed value (~w)",
[Field, ClientValue, S1, S2, ServerValue], none),
- {0, CloseMethod} =
- rabbit_binary_generator:map_exception(0, AmqpError, Protocol),
- ok = send_on_channel0(Sock, CloseMethod, Protocol),
rabbit_misc:protocol_error(AmqpError).
server_frame_max() ->