Merge bug26419

rabbitmq · Oct 20, 2014 · 55ba086 · 55ba086
2 parents 0d2ec6d + c58bf1c
commit 55ba086
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rabbit_common.app.in b/rabbit_common.app.in
@@ -27,6 +27,7 @@
              rabbit_misc,
              rabbit_msg_store_index,
              rabbit_net,
+             rabbit_networking,
              rabbit_nodes,
              rabbit_policy_validator,
              rabbit_reader,

diff --git a/src/amqp_network_connection.erl b/src/amqp_network_connection.erl
@@ -144,10 +144,12 @@ do_connect({Addr, Family},
                          [Family | ?RABBIT_TCP_OPTS] ++ ExtraOpts,
                          Timeout) of
         {ok, Sock} ->
-            SslOpts = orddict:merge(fun (_, _A, B) -> B end,
-                                    orddict:from_list(GlobalSslOpts),
-                                    orddict:from_list(SslOpts0)),
-            case ssl:connect(Sock, orddict:to_list(SslOpts)) of
+            SslOpts = rabbit_networking:fix_ssl_options(
+                        orddict:to_list(
+                          orddict:merge(fun (_, _A, B) -> B end,
+                                        orddict:from_list(GlobalSslOpts),
+                                        orddict:from_list(SslOpts0)))),
+            case ssl:connect(Sock, SslOpts) of
                 {ok, SslSock} ->
                     RabbitSslSock = #ssl_socket{ssl = SslSock, tcp = Sock},
                     try_handshake(AmqpParams, SIF,