diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-02-07 21:34:11 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-02-07 21:34:11 +0000 |
| commit | 6f9e00562be2166c0f58ebc5f3f959cd7daf0ced (patch) | |
| tree | b35a1dbdf7f8d612aa96a05993591bdf6d796b17 /src | |
| parent | 013a60ff0c1093d26319e90926ddfd32c3db48da (diff) | |
| parent | 25a2afa6379d638201dda02f49a52c043a879f91 (diff) | |
| download | rabbitmq-server-git-6f9e00562be2166c0f58ebc5f3f959cd7daf0ced.tar.gz | |
merge bug23804 into default (ssl connections dying prior to R14)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 4bb87f19d5..1781469a13 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -925,10 +925,14 @@ socket_info(Get, Select) -> end. ssl_info(F, Sock) -> + %% The first ok form is R14 + %% The second is R13 - the extra term is exportability (by inspection, + %% the docs are wrong) case rabbit_net:ssl_info(Sock) of - nossl -> ''; - {error, _} -> ''; - {ok, Info} -> F(Info) + nossl -> ''; + {error, _} -> ''; + {ok, {P, {K, C, H}}} -> F({P, {K, C, H}}); + {ok, {P, {K, C, H, _}}} -> F({P, {K, C, H}}) end. cert_info(F, Sock) -> |