Fix 'request_handlers' transformation

Fixes #2925

diff --git a/src/ejabberd_config_transformer.erl b/src/ejabberd_config_transformer.erl
index 82d9c4a155505d9415b2142bbbd6b39c9b928833..35ab8ddf0b1924a5ff01304cc08dd663db52a2e0 100644 (file)
--- a/src/ejabberd_config_transformer.erl
+++ b/src/ejabberd_config_transformer.erl
@@ -267,22 +267,26 @@ replace_request_handlers(Opts) ->
                     (PathMod) ->
                          PathMod
                  end, Handlers1),
-    lists:filtermap(
-      fun({captcha, _}) -> false;
-        ({register, _}) -> false;
-        ({web_admin, _}) -> false;
-        ({http_bind, _}) -> false;
-        ({xmlrpc, _}) -> false;
-        ({http_poll, _}) ->
-             ?WARNING_MSG("Listening option 'http_poll' is "
-                          "ignored: HTTP Polling support was "
-                          "removed in ejabberd 15.04. ~s",
-                          [adjust_hint()]),
-             false;
-        ({request_handlers, _}) ->
-             {true, {request_handlers, Handlers2}};
-        (_) -> true
-      end, Opts).
+    Opts1 = lists:filtermap(
+             fun({captcha, _}) -> false;
+                ({register, _}) -> false;
+                ({web_admin, _}) -> false;
+                ({http_bind, _}) -> false;
+                ({xmlrpc, _}) -> false;
+                ({http_poll, _}) ->
+                     ?WARNING_MSG("Listening option 'http_poll' is "
+                                  "ignored: HTTP Polling support was "
+                                  "removed in ejabberd 15.04. ~s",
+                                  [adjust_hint()]),
+                     false;
+                ({request_handlers, _}) ->
+                     false;
+                (_) -> true
+             end, Opts),
+    case Handlers2 of
+       [] -> Opts1;
+       _ -> [{request_handlers, Handlers2}|Opts1]
+    end.
 
 remove_xmlrpc_access_commands(Opts) ->
     lists:filter(