root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

amqp_network_connection: Use the new rabbit_ssl_options module 

rabbit_networking will shortly be moved to rabbitmq-server to fix a
dependency of this module on the broker.

[#118490793]
This commit is contained in:
Jean-Sébastien Pédron 2017-05-04 18:52:04 +02:00
parent 21b3a3a292
commit 987c437106
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/amqp_client/src/amqp_network_connection.erl vendored
View File

@ -144,7 +144,7 @@ do_connect({Addr, Family},
[Family | ?RABBIT_TCP_OPTS] ++ ExtraOpts,
Timeout) of
{ok, Sock} ->
SslOpts = rabbit_networking:fix_ssl_options(
SslOpts = rabbit_ssl_options:fix(
orddict:to_list(
orddict:merge(fun (_, _A, B) -> B end,
orddict:from_list(GlobalSslOpts),