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

Merge pull request #3371 from processone/3175-fixup 

Fix some edge cases in handling ssl information from PROXY protocol
This commit is contained in:
Michael Klishin 2021-09-07 09:11:52 +03:00 committed by GitHub
parent 47a3531cf7 6af41527f1
commit 14e1a53f76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/rabbit_common/src/rabbit_net.erl vendored
View File

@ -112,7 +112,7 @@ proxy_ssl_info(Sock, {rabbit_proxy_socket, _, ProxyInfo}) ->
end, end,
CipherSuite = case ssl:str_to_suite(binary_to_list(Cipher)) of CipherSuite = case ssl:str_to_suite(binary_to_list(Cipher)) of
#{} = CS -> CS; #{} = CS -> CS;
_ -> ssl_info(Sock) _ -> nossl
end, end,
case {Proto, CipherSuite} of case {Proto, CipherSuite} of
{nossl, _} -> ssl_info(Sock); {nossl, _} -> ssl_info(Sock);