diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-03-28 00:03:17 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-03-28 00:03:17 +0200 |
| commit | 510fde58d8aee68f5b81064209765ac4259017ac (patch) | |
| tree | 3ef7d2a6bf3f6153a51093eed6fd98f3e3383831 | |
| parent | ejabberd_http: Expand @VERSION@ in custom headers (diff) | |
mod_http_upload: Don't add "Server" header line
Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.
| -rw-r--r-- | src/mod_http_upload.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl index 31494c2e1..cb62bec7e 100644 --- a/src/mod_http_upload.erl +++ b/src/mod_http_upload.erl @@ -833,7 +833,6 @@ http_response(Host, Code, ExtraHeaders) -> -> {pos_integer(), [{binary(), binary()}], binary()}. http_response(Host, Code, ExtraHeaders, Body) -> - ServerHeader = {<<"Server">>, <<"ejabberd ", (?VERSION)/binary>>}, CustomHeaders = gen_mod:get_module_opt(Host, ?MODULE, custom_headers, fun(Headers) -> @@ -845,10 +844,9 @@ http_response(Host, Code, ExtraHeaders, Body) -> []), Headers = case proplists:is_defined(<<"Content-Type">>, ExtraHeaders) of true -> - [ServerHeader | ExtraHeaders]; + ExtraHeaders; false -> - [ServerHeader, {<<"Content-Type">>, <<"text/plain">>} | - ExtraHeaders] + [{<<"Content-Type">>, <<"text/plain">>} | ExtraHeaders] end ++ CustomHeaders, {Code, Headers, Body}. |