Support for "> ." in YAML configuration files

1 files changed, 14 insertions, 1 deletions

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index 0d25224b9..53936744e 100644
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -190,7 +190,7 @@ consult(File) ->
                 {ok, []} ->
                     {ok, []};
                 {ok, [Document|_]} ->
-                    {ok, Document};
+                    {ok, parserl(Document)};
                 {error, Err} ->
                     Msg1 = "Cannot load " ++ File ++ ": ",
                     Msg2 = p1_yaml:format_error(Err),
@@ -207,6 +207,19 @@ consult(File) ->
             end
     end.
 
+parserl([$>, $\s | String]) ->
+    {ok, A2, _} = erl_scan:string(String),
+    {ok, A3} = erl_parse:parse_term(A2),
+    A3;
+parserl(B) when is_binary(B) ->
+    parserl(binary_to_list(B));
+parserl({A, B}) ->
+    {parserl(A), parserl(B)};
+parserl([El|Tail]) ->
+    [parserl(El) | parserl(Tail)];
+parserl(Other) ->
+    Other.
+
 %% @doc Convert configuration filename to absolute path.
 %% Input is an absolute or relative path to an ejabberd configuration file.
 %% And returns an absolute path to the configuration file.