Merge bug 25688

rabbitmq · Jul 30, 2013 · 54cc5e1 · 54cc5e1
2 parents aad60ec + 91e7fc5
commit 54cc5e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/amqp_auth_mechanisms.erl b/src/amqp_auth_mechanisms.erl
@@ -19,7 +19,7 @@
 
 -include("amqp_client.hrl").
 
--export([plain/3, amqplain/3, external/3]).
+-export([plain/3, amqplain/3, external/3, crdemo/3]).
 
 %%---------------------------------------------------------------------------
 
@@ -41,3 +41,11 @@ external(none, _, init) ->
     {<<"EXTERNAL">>, []};
 external(none, _, _State) ->
     {<<"">>, _State}.
+
+crdemo(none, _, init) ->
+    {<<"RABBIT-CR-DEMO">>, 0};
+crdemo(none, #amqp_params_network{username = Username}, 0) ->
+    {Username, 1};
+crdemo(<<"Please tell me your password">>,
+       #amqp_params_network{password = Password}, 1) ->
+    {<<"My password is ", Password/binary>>, 2}.
diff --git a/src/amqp_network_connection.erl b/src/amqp_network_connection.erl
@@ -289,6 +289,8 @@ handshake_recv(Expecting) ->
             case {Expecting, element(1, Method)} of
                 {E, M} when E =:= M ->
                     Method;
+                {'connection.tune', 'connection.secure'} ->
+                    Method;
                 {'connection.open_ok', _} ->
                     {closing,
                      #amqp_error{name        = command_invalid,