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

6 files changed, 170 insertions, 108 deletions

diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index 2660d04d16..636d580e28 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2013. All Rights Reserved.
+# Copyright Ericsson AB 2005-2015. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -46,6 +46,7 @@ MODULES = \
 	httpd_connection_sup\
 	httpd_cgi \
 	httpd_conf \
+	httpd_custom \
 	httpd_example \
 	httpd_esi \
 	httpd_file\
diff --git a/lib/inets/src/http_server/httpd_custom.erl b/lib/inets/src/http_server/httpd_custom.erl
new file mode 100644
index 0000000000..342469a579
--- /dev/null
+++ b/lib/inets/src/http_server/httpd_custom.erl
@@ -0,0 +1,69 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2015-2015. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+%%
+-module(httpd_custom).
+
+-export([response_header/1, request_header/1]).
+-export([customize_headers/3]).
+
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+
+response_header(Header) -> 
+    {true, httpify(Header)}.
+request_header(Header) -> 
+    {true, Header}.
+
+customize_headers(?MODULE, Function, Arg) ->
+    ?MODULE:Function(Arg);
+customize_headers(Module, Function, Arg) ->
+    try Module:Function(Arg) of
+	{true, Value} ->
+	    ?MODULE:Function(Value);
+	false ->
+	    false
+    catch
+	_:_ ->
+	    ?MODULE:Function(Arg)
+    end.
+
+httpify({Key0, Value}) ->
+    %% make sure first letter is capital (defacto standard)
+    Words1 = string:tokens(Key0, "-"),
+    Words2 = upify(Words1, []),
+    Key    = new_key(Words2),
+    Key ++ ": " ++ Value ++ ?CRLF .
+
+new_key([]) ->
+    "";
+new_key([W]) ->
+    W;
+new_key([W1,W2]) ->
+    W1 ++ "-" ++ W2;
+new_key([W|R]) ->
+    W ++ "-" ++ new_key(R).
+    
+upify([], Acc) ->
+    lists:reverse(Acc);
+upify([Key|Rest], Acc) ->
+    upify(Rest, [upify2(Key)|Acc]).
+
+upify2([C|Rest]) when (C >= $a) andalso (C =< $z) ->
+    [C-($a-$A)|Rest];
+upify2(Str) ->
+    Str.
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl
index 3ff07616f9..782120c284 100644
--- a/lib/inets/src/http_server/httpd_request.erl
+++ b/lib/inets/src/http_server/httpd_request.erl
@@ -42,28 +42,28 @@
 %%%=========================================================================
 %%%  Internal application API
 %%%=========================================================================
-parse([Bin, MaxSizes]) ->
-    ?hdrt("parse", [{bin, Bin}, {max_sizes, MaxSizes}]),    
-    parse_method(Bin, [], 0, proplists:get_value(max_method, MaxSizes), MaxSizes, []);
+parse([Bin, Options]) ->
+    ?hdrt("parse", [{bin, Bin}, {max_sizes, Options}]),    
+    parse_method(Bin, [], 0, proplists:get_value(max_method, Options), Options, []);
 parse(Unknown) ->
     ?hdrt("parse", [{unknown, Unknown}]),
     exit({bad_args, Unknown}).
 
 %% Functions that may be returned during the decoding process
 %% if the input data is incompleate. 
-parse_method([Bin, Method, Current, Max, MaxSizes, Result]) ->
-    parse_method(Bin, Method, Current, Max, MaxSizes, Result).
+parse_method([Bin, Method, Current, Max, Options, Result]) ->
+    parse_method(Bin, Method, Current, Max, Options, Result).
 
-parse_uri([Bin, URI, Current, Max, MaxSizes, Result]) ->
-    parse_uri(Bin, URI, Current, Max, MaxSizes, Result).
+parse_uri([Bin, URI, Current, Max, Options, Result]) ->
+    parse_uri(Bin, URI, Current, Max, Options, Result).
 
-parse_version([Bin, Rest, Version, Current, Max, MaxSizes, Result]) ->
-    parse_version(<<Rest/binary, Bin/binary>>, Version, Current, Max, MaxSizes, 
+parse_version([Bin, Rest, Version, Current, Max, Options, Result]) ->
+    parse_version(<<Rest/binary, Bin/binary>>, Version, Current, Max, Options, 
 		  Result).
 
-parse_headers([Bin, Rest, Header, Headers, Current, Max, MaxSizes, Result]) ->
+parse_headers([Bin, Rest, Header, Headers, Current, Max, Options, Result]) ->
     parse_headers(<<Rest/binary, Bin/binary>>, 
-		  Header, Headers, Current, Max, MaxSizes, Result).
+		  Header, Headers, Current, Max, Options, Result).
 
 whole_body([Bin, Body, Length])  ->
     whole_body(<<Body/binary, Bin/binary>>, Length).    
@@ -134,13 +134,13 @@ update_mod_data(ModData, Method, RequestURI, HTTPVersion, Headers)->
 %%%========================================================================
 %%% Internal functions
 %%%========================================================================
-parse_method(<<>>, Method, Current, Max, MaxSizes, Result) ->
-    {?MODULE, parse_method, [Method, Current, Max, MaxSizes, Result]};
-parse_method(<<?SP, Rest/binary>>, Method, _Current, _Max, MaxSizes, Result) ->
-    parse_uri(Rest, [], 0,  proplists:get_value(max_uri, MaxSizes), MaxSizes,
+parse_method(<<>>, Method, Current, Max, Options, Result) ->
+    {?MODULE, parse_method, [Method, Current, Max, Options, Result]};
+parse_method(<<?SP, Rest/binary>>, Method, _Current, _Max, Options, Result) ->
+    parse_uri(Rest, [], 0,  proplists:get_value(max_uri, Options), Options,
 	      [string:strip(lists:reverse(Method)) | Result]);
-parse_method(<<Octet, Rest/binary>>, Method, Current, Max, MaxSizes, Result) when Current =< Max ->
-    parse_method(Rest, [Octet | Method], Current + 1, Max, MaxSizes, Result);
+parse_method(<<Octet, Rest/binary>>, Method, Current, Max, Options, Result) when Current =< Max ->
+    parse_method(Rest, [Octet | Method], Current + 1, Max, Options, Result);
 parse_method(_, _, _, Max, _, _) ->
     %% We do not know the version of the client as it comes after the
     %% method send the lowest version in the response so that the client
@@ -153,30 +153,30 @@ parse_uri(_, _, Current, MaxURI, _, _)
     %% uri send the lowest version in the response so that the client
     %% will be able to handle it.
     {error, {size_error, MaxURI, 414, "URI unreasonably long"},lowest_version()};
-parse_uri(<<>>, URI, Current, Max, MaxSizes, Result) ->
-    {?MODULE, parse_uri, [URI, Current, Max, MaxSizes, Result]};
-parse_uri(<<?SP, Rest/binary>>, URI, _, _, MaxSizes, Result) -> 
-    parse_version(Rest, [], 0, proplists:get_value(max_version, MaxSizes), MaxSizes, 
+parse_uri(<<>>, URI, Current, Max, Options, Result) ->
+    {?MODULE, parse_uri, [URI, Current, Max, Options, Result]};
+parse_uri(<<?SP, Rest/binary>>, URI, _, _, Options, Result) -> 
+    parse_version(Rest, [], 0, proplists:get_value(max_version, Options), Options, 
 		  [string:strip(lists:reverse(URI)) | Result]);
 %% Can happen if it is a simple HTTP/0.9 request e.i "GET /\r\n\r\n"
-parse_uri(<<?CR, _Rest/binary>> = Data, URI, _, _, MaxSizes, Result) ->
-    parse_version(Data, [], 0, proplists:get_value(max_version, MaxSizes), MaxSizes, 
+parse_uri(<<?CR, _Rest/binary>> = Data, URI, _, _, Options, Result) ->
+    parse_version(Data, [], 0, proplists:get_value(max_version, Options), Options, 
 		  [string:strip(lists:reverse(URI)) | Result]);
-parse_uri(<<Octet, Rest/binary>>, URI, Current, Max, MaxSizes, Result) ->
-    parse_uri(Rest, [Octet | URI], Current + 1, Max, MaxSizes, Result).
+parse_uri(<<Octet, Rest/binary>>, URI, Current, Max, Options, Result) ->
+    parse_uri(Rest, [Octet | URI], Current + 1, Max, Options, Result).
 
-parse_version(<<>>, Version, Current, Max, MaxSizes, Result) ->
-    {?MODULE, parse_version, [<<>>, Version, Current, Max, MaxSizes, Result]};
-parse_version(<<?LF, Rest/binary>>, Version, Current, Max, MaxSizes, Result) ->
+parse_version(<<>>, Version, Current, Max, Options, Result) ->
+    {?MODULE, parse_version, [<<>>, Version, Current, Max, Options, Result]};
+parse_version(<<?LF, Rest/binary>>, Version, Current, Max, Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_version(<<?CR, ?LF, Rest/binary>>, Version, Current, Max, MaxSizes, Result);
-parse_version(<<?CR, ?LF, Rest/binary>>, Version, _, _,  MaxSizes, Result) ->
-    parse_headers(Rest, [], [], 0, proplists:get_value(max_header, MaxSizes), MaxSizes, 
+    parse_version(<<?CR, ?LF, Rest/binary>>, Version, Current, Max, Options, Result);
+parse_version(<<?CR, ?LF, Rest/binary>>, Version, _, _,  Options, Result) ->
+    parse_headers(Rest, [], [], 0, proplists:get_value(max_header, Options), Options, 
 		  [string:strip(lists:reverse(Version)) | Result]);
-parse_version(<<?CR>> = Data, Version, Current, Max, MaxSizes, Result) ->
-    {?MODULE, parse_version, [Data, Version, Current, Max, MaxSizes, Result]};
-parse_version(<<Octet, Rest/binary>>, Version, Current, Max, MaxSizes, Result)  when Current =< Max ->
-    parse_version(Rest, [Octet | Version], Current + 1, Max, MaxSizes, Result);
+parse_version(<<?CR>> = Data, Version, Current, Max, Options, Result) ->
+    {?MODULE, parse_version, [Data, Version, Current, Max, Options, Result]};
+parse_version(<<Octet, Rest/binary>>, Version, Current, Max, Options, Result)  when Current =< Max ->
+    parse_version(Rest, [Octet | Version], Current + 1, Max, Options, Result);
 parse_version(_, _, _, Max,_,_) ->
     {error, {size_error, Max, 413, "Version string unreasonably long"}, lowest_version()}.
 
@@ -185,34 +185,42 @@ parse_headers(_, _, _, Current, Max, _, Result)
     HttpVersion = lists:nth(3, lists:reverse(Result)),
     {error, {size_error, Max, 413, "Headers unreasonably long"}, HttpVersion};
 
-parse_headers(<<>>, Header, Headers, Current, Max, MaxSizes, Result) ->
+parse_headers(<<>>, Header, Headers, Current, Max, Options, Result) ->
     {?MODULE, parse_headers, [<<>>, Header, Headers, Current, Max, 
-			      MaxSizes, Result]};
-parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], Current, Max, MaxSizes, Result) ->
+			      Options, Result]};
+parse_headers(<<?CR,?LF,?LF,Body/binary>>, [], [], Current, Max, Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
     parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max,  
-		  MaxSizes, Result);
+		  Options, Result);
 
-parse_headers(<<?LF,?LF,Body/binary>>, [], [], Current, Max,  MaxSizes, Result) ->
+parse_headers(<<?LF,?LF,Body/binary>>, [], [], Current, Max,  Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
     parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], Current, Max, 
-		  MaxSizes, Result);
+		  Options, Result);
 
 parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, [], [], _, _,  _, Result) ->
     NewResult = list_to_tuple(lists:reverse([Body, {#http_request_h{}, []} |
 					     Result])),
     {ok, NewResult};
 parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _, _,
-	      MaxSizes, Result) ->
+	      Options, Result) ->
+    Customize = proplists:get_value(customize, Options),
     case http_request:key_value(lists:reverse(Header)) of
 	undefined -> %% Skip headers with missing :
-	    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers(Headers, #http_request_h{}), Headers} | Result]))};
+	    FinalHeaders = lists:filtermap(fun(H) ->
+						   httpd_custom:customize_headers(Customize, request_header, H)
+					   end,
+					   Headers),
+	    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers(FinalHeaders, #http_request_h{}), FinalHeaders} | Result]))};
 	NewHeader ->
-	    case check_header(NewHeader, MaxSizes) of 
+	    case check_header(NewHeader, Options) of 
 		ok ->
-		    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers([NewHeader | Headers], 
+		    FinalHeaders = lists:filtermap(fun(H) ->
+							   httpd_custom:customize_headers(Customize, request_header, H)
+						   end, [NewHeader | Headers]),
+		    {ok, list_to_tuple(lists:reverse([Body, {http_request:headers(FinalHeaders, 
 										  #http_request_h{}),  
-							     [NewHeader | Headers]} | Result]))};
+							     FinalHeaders} | Result]))};
 		
 		{error, Reason} ->
 		    HttpVersion = lists:nth(3, lists:reverse(Result)),
@@ -221,12 +229,12 @@ parse_headers(<<?CR,?LF,?CR,?LF,Body/binary>>, Header, Headers, _, _,
     end;
 
 parse_headers(<<?CR,?LF,?CR>> = Data, Header, Headers, Current, Max, 
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
-			      MaxSizes, Result]};
-parse_headers(<<?LF>>, [], [], Current, Max, MaxSizes, Result) ->
+			      Options, Result]};
+parse_headers(<<?LF>>, [], [], Current, Max, Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF>>, [], [], Current, Max, MaxSizes, Result);
+    parse_headers(<<?CR,?LF>>, [], [], Current, Max, Options, Result);
 
 %% There where no headers, which is unlikely to happen.
 parse_headers(<<?CR,?LF>>, [], [], _, _, _, Result) ->
@@ -235,30 +243,30 @@ parse_headers(<<?CR,?LF>>, [], [], _, _, _, Result) ->
     {ok, NewResult};
 
 parse_headers(<<?LF>>, Header, Headers, Current, Max,  
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
-    parse_headers(<<?CR,?LF>>, Header, Headers, Current, Max, MaxSizes, Result);
+    parse_headers(<<?CR,?LF>>, Header, Headers, Current, Max, Options, Result);
 
 parse_headers(<<?CR,?LF>> = Data, Header, Headers, Current, Max, 
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
-			      MaxSizes, Result]};
+			      Options, Result]};
 parse_headers(<<?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
     parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, Current, Max,
-		  MaxSizes, Result); 
+		  Options, Result); 
 parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     case http_request:key_value(lists:reverse(Header)) of
 	undefined -> %% Skip headers with missing :
 	    parse_headers(Rest, [Octet], Headers, 
-			  0, Max, MaxSizes, Result);
+			  0, Max, Options, Result);
 	NewHeader ->
-	    case check_header(NewHeader, MaxSizes) of 
+	    case check_header(NewHeader, Options) of 
 		ok ->
 		    parse_headers(Rest, [Octet], [NewHeader | Headers], 
-				  0, Max, MaxSizes, Result);
+				  0, Max, Options, Result);
 		{error, Reason} ->
 		    HttpVersion = lists:nth(3, lists:reverse(Result)),
 		    {error, Reason, HttpVersion}
@@ -266,19 +274,19 @@ parse_headers(<<?CR,?LF, Octet, Rest/binary>>, Header, Headers, _, Max,
     end;
 	
 parse_headers(<<?CR>> = Data, Header, Headers, Current, Max,  
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     {?MODULE, parse_headers, [Data, Header, Headers, Current, Max, 
-			      MaxSizes, Result]};
+			      Options, Result]};
 parse_headers(<<?LF>>, Header, Headers, Current,  Max, 
-	      MaxSizes, Result) ->
+	      Options, Result) ->
     %% If ?CR is is missing RFC2616 section-19.3 
     parse_headers(<<?CR, ?LF>>, Header, Headers, Current, Max,  
-		  MaxSizes, Result);
+		  Options, Result);
 
 parse_headers(<<Octet, Rest/binary>>, Header, Headers, Current,
-	      Max, MaxSizes, Result) ->
+	      Max, Options, Result) ->
     parse_headers(Rest, [Octet | Header], Headers, Current + 1, Max,
-		  MaxSizes, Result).
+		  Options, Result).
 
 whole_body(Body, Length) ->
     case size(Body) of
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index f7a9fe5d49..9947e17b47 100644
--- a/lib/inets/src/http_server/httpd_request_handler.erl
+++ b/lib/inets/src/http_server/httpd_request_handler.erl
@@ -121,13 +121,15 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
     MaxURISize    = max_uri_size(ConfigDB), 
     NrOfRequest   = max_keep_alive_request(ConfigDB), 
     MaxContentLen = max_content_length(ConfigDB),
+    Customize = customize(ConfigDB),
 
     {_, Status} = httpd_manager:new_connection(Manager),
     
     MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
 				   {max_version, ?HTTP_MAX_VERSION_STRING}, 
 				   {max_method, ?HTTP_MAX_METHOD_STRING},
-				   {max_content_length, MaxContentLen}
+				   {max_content_length, MaxContentLen},
+				   {customize, Customize}
 				  ]]}, 
 
     State = #state{mod                    = Mod, 
@@ -550,11 +552,13 @@ handle_next_request(#state{mod = #mod{connection = true} = ModData,
     MaxHeaderSize = max_header_size(ModData#mod.config_db), 
     MaxURISize    = max_uri_size(ModData#mod.config_db), 
     MaxContentLen = max_content_length(ModData#mod.config_db),
+    Customize = customize(ModData#mod.config_db),
 
     MFA = {httpd_request, parse, [[{max_uri, MaxURISize}, {max_header, MaxHeaderSize},
 				   {max_version, ?HTTP_MAX_VERSION_STRING}, 
 				   {max_method, ?HTTP_MAX_METHOD_STRING},
-				   {max_content_length, MaxContentLen}
+				   {max_content_length, MaxContentLen},
+				   {customize, Customize}
 				  ]]}, 
     TmpState = State#state{mod                    = NewModData,
 			   mfa                    = MFA,
@@ -640,3 +644,6 @@ max_keep_alive_request(ConfigDB) ->
 
 max_content_length(ConfigDB) ->    
     httpd_util:lookup(ConfigDB, max_content_length, ?HTTP_MAX_CONTENT_LENGTH).
+
+customize(ConfigDB) ->    
+    httpd_util:lookup(ConfigDB, customize, httpd_custom).
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 2fa91d47a0..71dc05e46d 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -176,7 +176,7 @@ send_header(#mod{socket_type  = Type,
     StatusLine = [NewVer, " ", io_lib:write(NewStatusCode), " ",
 		  httpd_util:reason_phrase(NewStatusCode), ?CRLF],
     ConnectionHeader = get_connection(Conn, NewVer),
-    Head = list_to_binary([StatusLine, Headers, ConnectionHeader , ?CRLF]),
+    Head = [StatusLine, Headers, ConnectionHeader , ?CRLF],
     httpd_socket:deliver(Type, Sock, Head).
 
 map_status_code("HTTP/1.0", Code) 
@@ -286,45 +286,21 @@ create_header(ConfigDb, KeyValueTupleHeaders) ->
     Date        = httpd_util:rfc1123_date(), 
     ContentType = "text/html", 
     Server      = server(ConfigDb),
-    NewHeaders  = add_default_headers([{"date",         Date},
-				       {"content-type", ContentType}
-				       | if Server=="" -> [];
-					    true -> [{"server",       Server}]
-					 end
-				      ], 
-				       KeyValueTupleHeaders),
-    lists:map(fun fix_header/1, NewHeaders).
-
-
+    Headers0  = add_default_headers([{"date",         Date},
+				     {"content-type", ContentType}
+				     | if Server=="" -> [];
+					  true -> [{"server",       Server}]
+				       end
+				    ], 
+				    KeyValueTupleHeaders),
+    CustomizeCB = httpd_util:lookup(ConfigDb, customize, httpd_custom),
+    lists:filtermap(fun(H) ->
+			    httpd_custom:customize_headers(CustomizeCB, response_header, H)
+		    end,
+		    [Header || Header <- Headers0]).
 server(ConfigDb) ->
     httpd_util:lookup(ConfigDb, server, ?SERVER_SOFTWARE).
 
-fix_header({Key0, Value}) ->
-    %% make sure first letter is capital
-    Words1 = string:tokens(Key0, "-"),
-    Words2 = upify(Words1, []),
-    Key    = new_key(Words2),
-    Key ++ ": " ++ Value ++ ?CRLF .
-
-new_key([]) ->
-    "";
-new_key([W]) ->
-    W;
-new_key([W1,W2]) ->
-    W1 ++ "-" ++ W2;
-new_key([W|R]) ->
-    W ++ "-" ++ new_key(R).
-    
-upify([], Acc) ->
-    lists:reverse(Acc);
-upify([Key|Rest], Acc) ->
-    upify(Rest, [upify2(Key)|Acc]).
-
-upify2([C|Rest]) when (C >= $a) andalso (C =< $z) ->
-    [C-($a-$A)|Rest];
-upify2(Str) ->
-    Str.
-
 add_default_headers([], Headers) ->
     Headers;
 
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 9eae962d03..48660bec62 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -61,6 +61,7 @@
 	    httpd_cgi,
 	    httpd_connection_sup,
             httpd_conf,
+	    httpd_custom,
 	    httpd_esi,
             httpd_example,
 	    httpd_file,