diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-11 16:42:58 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-11 16:42:58 +0000 |
| commit | a5071d8d0dfcff236bda1012ed2fc685a9216db3 (patch) | |
| tree | f256f4c1a166fe90eacf6f0822a6eb59818c2c17 | |
| parent | 0649dbb8d171a8d7e8826875290ccfa06fbf46cf (diff) | |
| download | rabbitmq-server-bug23493.tar.gz | |
Make peer_cert_* info items into binaries; remove the special-casing of string-y lists as not escaped.bug23493
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 6b212745..6c0a727b 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -346,8 +346,6 @@ format_info_item([{TableEntryKey, TableEntryType, _TableEntryValue} | _] = Value) when is_binary(TableEntryKey) andalso is_atom(TableEntryType) -> io_lib:format("~1000000000000p", [prettify_amqp_table(Value)]); -format_info_item([C|_] = Value) when is_number(C), C >= 32, C =< 255 -> - Value; format_info_item(Value) -> io_lib:format("~w", [Value]). diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 33ac5f48..6017326a 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -891,7 +891,7 @@ cert_info(F, Sock) -> case rabbit_net:peercert(Sock) of nossl -> ''; {error, no_peercert} -> ''; - {ok, Cert} -> F(Cert) + {ok, Cert} -> list_to_binary(F(Cert)) end. %%-------------------------------------------------------------------------- |