diff options
| author | Badlop <badlop@process-one.net> | 2020-02-26 13:35:47 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2020-02-26 13:56:38 +0100 |
| commit | 00abf5d42c9b9c979b7ac69758a8f6745744f929 (patch) | |
| tree | b2fbc3d728ca98385fa70c9405f0da12dc665556 /src/ejabberd_http.erl | |
| parent | Support ssl connection on mysql (diff) | |
Fix handle of 'http' atom in Headers, problem introduced in 357e7e11
Diffstat (limited to 'src/ejabberd_http.erl')
| -rw-r--r-- | src/ejabberd_http.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index fdc9321ef..fad51f44f 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -857,9 +857,13 @@ parse_urlencoded(<<>>, Last, Cur, _State) -> parse_urlencoded(undefined, _, _, _) -> []. apply_custom_headers(Headers, CustomHeaders) -> - M = maps:merge(maps:from_list(Headers), + {Doctype, Headers2} = case Headers -- [html] of + Headers -> {[], Headers}; + Other -> {[html], Other} + end, + M = maps:merge(maps:from_list(Headers2), maps:from_list(CustomHeaders)), - maps:to_list(M). + Doctype ++ maps:to_list(M). % The following code is mostly taken from yaws_ssl.erl |