summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2015-02-17 16:23:32 +0300
committerMichael Klishin <michael@rabbitmq.com>2015-02-17 16:23:32 +0300
commit38b8c301eeb5450e5d80937dd958b402b61a5135 (patch)
treeb5b9978d6a3f4e9afa447e4b6aefdb61da7e1c64 /src
parent2f1a59b34955bb936893de1bb5c5fc8a5caba911 (diff)
parent9631d4ba17e0700430cf1ac8c1754d5030432bf3 (diff)
downloadrabbitmq-server-git-38b8c301eeb5450e5d80937dd958b402b61a5135.tar.gz
Merge heads of default
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 11c2d8e5df..e3247439ef 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -1220,9 +1220,9 @@ ssl_info(F, #v1{sock = Sock}) ->
cert_info(F, #v1{sock = Sock}) ->
case rabbit_net:peercert(Sock) of
- nossl -> '';
- {error, no_peercert} -> '';
- {ok, Cert} -> list_to_binary(F(Cert))
+ nossl -> '';
+ {error, _} -> '';
+ {ok, Cert} -> list_to_binary(F(Cert))
end.
maybe_emit_stats(State) ->