diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-09-07 09:11:52 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-09-07 09:53:58 +0300 |
| commit | a4717a8c20c774425c15ac5816bf3d9bbe53ebaa (patch) | |
| tree | 5a496e7859789ced68e323594308b5997a80a749 | |
| parent | 1d1f6bfc988135dcf2cc2c3154f490f97fb5eab1 (diff) | |
| download | rabbitmq-server-git-a4717a8c20c774425c15ac5816bf3d9bbe53ebaa.tar.gz | |
Merge pull request #3371 from processone/3175-fixup
Fix some edge cases in handling ssl information from PROXY protocol
(cherry picked from commit 14e1a53f76f9b00250917494f2fe233fd3cb9022)
| -rw-r--r-- | deps/rabbit_common/src/rabbit_net.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/rabbit_common/src/rabbit_net.erl b/deps/rabbit_common/src/rabbit_net.erl index 8ac59a2eb2..a2325c45be 100644 --- a/deps/rabbit_common/src/rabbit_net.erl +++ b/deps/rabbit_common/src/rabbit_net.erl @@ -112,7 +112,7 @@ proxy_ssl_info(Sock, {rabbit_proxy_socket, _, ProxyInfo}) -> end, CipherSuite = case ssl:str_to_suite(binary_to_list(Cipher)) of #{} = CS -> CS; - _ -> ssl_info(Sock) + _ -> nossl end, case {Proto, CipherSuite} of {nossl, _} -> ssl_info(Sock); |