Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Don't crash web admin when displaying info about websocket using users

This commit is contained in:
Paweł Chmielowski 2015-07-22 11:54:11 +02:00
parent 9091fcb1a1
commit 8df134e025
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ejabberd_c2s.erl
View File

@ -2025,6 +2025,7 @@ get_conn_type(StateData) ->
p1_tls -> c2s_compressed_tls p1_tls -> c2s_compressed_tls
end; end;
ejabberd_http_bind -> http_bind; ejabberd_http_bind -> http_bind;
ejabberd_http_ws -> websocket;
_ -> unknown _ -> unknown
end. end.

6
src/ejabberd_web_admin.erl
View File

@ -1557,7 +1557,11 @@ user_info(User, Server, Query, Lang) ->
c2s_compressed_tls -> c2s_compressed_tls ->
<<"tls+zlib">>; <<"tls+zlib">>;
http_bind -> http_bind ->
<<"http-bind">> <<"http-bind">>;
websocket ->
<<"websocket">>;
_ ->
<<"unknown">>
end, end,
<<ConnS/binary, <<ConnS/binary,
"://", "://",