diff options
| author | Erlang/OTP <[email protected]> | 2015-04-22 13:39:45 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-04-22 13:39:45 +0200 |
| commit | 871c5af1e44a423106d644ca6e70900ad21d41b4 (patch) | |
| tree | 7f9934080ba0551c6b6a42f7b3a7c294b6efe972 /lib/inets/src/http_server/httpd_response.erl | |
| parent | bbac1019905e6e493a2cd3c8463e53a818d0723d (diff) | |
| parent | ab9c37a30c960cbc5e5b72c73a3a315afc4c3920 (diff) | |
| download | otp-871c5af1e44a423106d644ca6e70900ad21d41b4.tar.gz otp-871c5af1e44a423106d644ca6e70900ad21d41b4.tar.bz2 otp-871c5af1e44a423106d644ca6e70900ad21d41b4.zip | |
Merge branch 'hans/inets/banner_grabbing/OTP-12661' into maint-17
* hans/inets/banner_grabbing/OTP-12661:
inets: Add value 'none' in server_tokens config
Diffstat (limited to 'lib/inets/src/http_server/httpd_response.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_response.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl index 0895729d05..2fa91d47a0 100644 --- a/lib/inets/src/http_server/httpd_response.erl +++ b/lib/inets/src/http_server/httpd_response.erl @@ -287,8 +287,11 @@ create_header(ConfigDb, KeyValueTupleHeaders) -> ContentType = "text/html", Server = server(ConfigDb), NewHeaders = add_default_headers([{"date", Date}, - {"content-type", ContentType}, - {"server", Server}], + {"content-type", ContentType} + | if Server=="" -> []; + true -> [{"server", Server}] + end + ], KeyValueTupleHeaders), lists:map(fun fix_header/1, NewHeaders). |