Merge tag 'OTP-17.5.6' into maint

=== OTP-17.5.6 ===

Changed Applications:
- inets-5.10.9
- ssh-3.2.4
- ssl-6.0.1

Unchanged Applications:
- asn1-3.0.4
- common_test-1.10.1
- compiler-5.0.4
- cosEvent-2.1.15
- cosEventDomain-1.1.14
- cosFileTransfer-1.1.16
- cosNotification-1.1.21
- cosProperty-1.1.17
- cosTime-1.1.14
- cosTransactions-1.2.14
- crypto-3.5
- debugger-4.0.3
- dialyzer-2.7.4
- diameter-1.9.2
- edoc-0.7.16
- eldap-1.1.1
- erl_docgen-0.3.7
- erl_interface-3.7.20
- erts-6.4.1
- et-1.5
- eunit-2.2.9
- gs-1.5.16
- hipe-3.11.3
- ic-4.3.6
- jinterface-1.5.12
- kernel-3.2
- megaco-3.17.3
- mnesia-4.12.5
- observer-2.0.4
- odbc-2.10.22
- orber-3.7.1
- os_mon-2.3.1
- ose-1.0.2
- otp_mibs-1.0.10
- parsetools-2.0.12
- percept-0.8.10
- public_key-0.23
- reltool-0.6.6
- runtime_tools-1.8.16
- sasl-2.4.1
- snmp-5.1.2
- stdlib-2.4
- syntax_tools-1.6.18
- test_server-3.8.1
- tools-2.7.2
- typer-0.9.8
- webtool-0.8.10
- wx-1.3.3
- xmerl-1.3.7

1 files changed, 44 insertions, 7 deletions

diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 342004f19b..1457f735ad 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -53,6 +53,8 @@ all() ->
      {group, https_basic},
      {group, http_limit},
      {group, https_limit},
+     {group, http_custom},
+     {group, https_custom},
      {group, http_basic_auth},
      {group, https_basic_auth},
      {group, http_auth_api},
@@ -75,6 +77,8 @@ groups() ->
      {https_basic, [], basic_groups()},
      {http_limit, [], [{group, limit}]},
      {https_limit, [], [{group, limit}]},
+     {http_custom, [], [{group,  custom}]},
+     {https_custom, [], [{group,  custom}]},
      {http_basic_auth, [], [{group, basic_auth}]},
      {https_basic_auth, [], [{group, basic_auth}]},
      {http_auth_api, [], [{group, auth_api}]},
@@ -89,7 +93,8 @@ groups() ->
      {https_security, [], [{group, security}]},
      {http_reload, [], [{group, reload}]},
      {https_reload, [], [{group, reload}]},
-     {limit, [],  [max_clients_1_1, max_clients_1_0, max_clients_0_9]},  
+     {limit, [],  [max_clients_1_1, max_clients_1_0, max_clients_0_9]}, 
+     {custom, [],  [customize]},  
      {reload, [], [non_disturbing_reconfiger_dies,
 		   disturbing_reconfiger_dies,
 		   non_disturbing_1_1, 
@@ -177,6 +182,7 @@ end_per_suite(_Config) ->
 %%--------------------------------------------------------------------
 init_per_group(Group, Config0) when Group == https_basic;
 				    Group == https_limit;
+				    Group == https_custom;
 				    Group == https_basic_auth;
 				    Group == https_auth_api;
 				    Group == https_auth_api_dets;
@@ -187,6 +193,7 @@ init_per_group(Group, Config0) when Group == https_basic;
     init_ssl(Group, Config0);
 init_per_group(Group, Config0)  when  Group == http_basic;
 				      Group == http_limit;
+				      Group == http_custom;
 				      Group == http_basic_auth;
 				      Group == http_auth_api;
 				      Group == http_auth_api_dets;
@@ -973,6 +980,30 @@ missing_CR(Config) ->
 					{version, Version}]).
 
 %%-------------------------------------------------------------------------
+customize() ->
+    [{doc, "Test filtering of headers with custom callback"}].
+
+customize(Config) when is_list(Config) -> 
+    Version = "HTTP/1.1",
+    Host = ?config(host, Config),
+    Type = ?config(type, Config),
+    ok = httpd_test_lib:verify_request(?config(type, Config), Host, 
+				       ?config(port, Config),  
+				       transport_opts(Type, Config),
+				       ?config(node, Config),
+				       http_request("GET /index.html ", Version, Host),
+				       [{statuscode, 200},
+					{header, "Content-Type", "text/html"},
+					{header, "Date"},
+					{no_header, "Server"},
+					{version, Version}]).
+
+response_header({"server", _}) ->
+    false;
+response_header(Header) ->
+    {true, Header}.
+
+%%-------------------------------------------------------------------------
 max_header() ->
     ["Denial Of Service (DOS) attack, prevented by max_header"].
 max_header(Config) when is_list(Config) ->
@@ -1312,24 +1343,26 @@ setup_server_dirs(ServerRoot, DocRoot, DataDir) ->
     
 start_apps(Group) when  Group == https_basic;
 			Group == https_limit;
+			Group == https_custom;
 			Group == https_basic_auth;
 			Group == https_auth_api;
 			Group == https_auth_api_dets;
 			Group == https_auth_api_mnesia;
-			Group == http_htaccess;
-			Group == http_security;
-			Group == http_reload
+			Group == https_htaccess;
+			Group == https_security;
+			Group == https_reload
 			->
     inets_test_lib:start_apps([inets, asn1, crypto, public_key, ssl]);
 start_apps(Group) when  Group == http_basic;
 			Group == http_limit;
+			Group == http_custom;
 			Group == http_basic_auth;
 			Group == http_auth_api;
 			Group == http_auth_api_dets;
 			Group == http_auth_api_mnesia;			
-			Group == https_htaccess;
-			Group == https_security;
-			Group == https_reload->
+			Group == http_htaccess;
+			Group == http_security;
+			Group == http_reload->
     inets_test_lib:start_apps([inets]).
 
 server_start(_, HttpdConfig) ->
@@ -1381,6 +1414,10 @@ server_config(http_limit, Config) ->
     [{max_clients, 1},
      %% Make sure option checking code is run
      {max_content_length, 100000002}]  ++ server_config(http, Config);
+server_config(http_custom, Config) ->
+    [{custom, ?MODULE}]  ++ server_config(http, Config);
+server_config(https_custom, Config) ->
+    [{custom, ?MODULE}]  ++ server_config(https, Config);
 server_config(https_limit, Config) ->
     [{max_clients, 1}]  ++ server_config(https, Config);
 server_config(http_basic_auth, Config) ->