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.

diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index 31494c2e1f8c5c61eb78b03c0f3a3c4106ec5135..cb62bec7ec0414bfb2e0b9245dc6efd9f6b55539 100644 (file)
--- 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}.