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

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index f982f911584eae618ce0252b0f6360113af0f01a..e6f55c48993ddf6cfd2c1541a1dbf3a55e584ddc 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -2025,6 +2025,7 @@ get_conn_type(StateData) ->
            p1_tls -> c2s_compressed_tls
        end;
     ejabberd_http_bind -> http_bind;
+    ejabberd_http_ws -> websocket;
     _ -> unknown
     end.
 

diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index 3347f3e6eb82a817a183c129f860dad5fb7dea50..75313de2b60d6fb93fa1fe81290cc76efe1780e7 100644 (file)
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -1557,7 +1557,11 @@ user_info(User, Server, Query, Lang) ->
                                                           c2s_compressed_tls ->
                                                               <<"tls+zlib">>;
                                                           http_bind ->
-                                                              <<"http-bind">>
+                                                              <<"http-bind">>;
+                                                          websocket ->
+                                                              <<"websocket">>;
+                                                          _ ->
+                                                              <<"unknown">>
                                                       end,
                                               <<ConnS/binary,
                                                 "://",