Merge branch 'ia/R15B03/inets-5.9.8' into maint-r15

* refs/heads/fetch-and-merge.maint-r15-opu/FETCH_HEAD/11632: (73 commits)
  Changed to correct errorcode in testcase
  inets: Prepare for release
  inets: Make test suites independent of each other
  inets: Rewrite of test case to avoid timing issues in test code
  Add missing brackets to report formatting on ftp_progress process exit
  inets: Remove log message as it causes more harm than use at the moment
  inets: Mend broken max_clients check
  inets: Start CT'ify httpd_SUITE
  inets: Remove use of default gen_server timeout
  Fix http_request:http_headers/1 to send content-length when length is zero
  Fix httpd config option 'keep_alive_timeout'
  Fix httpd config option 'script_timeout'
  inets: Restore ftp test files for the inets_{,sup_}SUITE to not fail
  inets: Add crypto start check to ssl test cases
  ftp: fix sockname dialyzer warning including ftp:sockname/1 bug
  ftp,ssl: Fixes broken type link (ssloption).
  ftp: Adds dynamic cert generation to tests.
  ftp: Clean Makefile and conf file
  ftp: Linking rfc-refs.
  ftp: Add documentation.
  ...

1 files changed, 15 insertions, 7 deletions

diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 190967f656..27446ca7fe 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. 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
@@ -589,11 +589,17 @@ validate_config_params([{server_tokens, {private, Value}} | Rest])
 validate_config_params([{server_tokens, Value} | _]) ->
     throw({server_tokens, Value});
 
+validate_config_params([{socket_type, ip_comm} | Rest]) ->
+    validate_config_params(Rest);
+
 validate_config_params([{socket_type, Value} | Rest]) 
-  when (Value =:= ip_comm) orelse 
-       (Value =:= ssl) orelse 
-       (Value =:= essl) ->
+  when Value == ssl; Value == essl ->
     validate_config_params(Rest);
+
+validate_config_params([{socket_type, {Value, _}} | Rest])
+  when Value == essl orelse Value == ssl ->
+    validate_config_params(Rest);
+
 validate_config_params([{socket_type, Value} | _]) ->
     throw({socket_type, Value});
 
@@ -792,6 +798,8 @@ store({log_format, LogFormat}, _ConfigList)
 store({server_tokens, ServerTokens} = Entry, _ConfigList) ->
     Server = server(ServerTokens), 
     {ok, [Entry, {server, Server}]};
+store({keep_alive_timeout, KeepAliveTimeout}, _ConfigList) ->
+    {ok, {keep_alive_timeout, KeepAliveTimeout * 1000}};
 store(ConfigListEntry, _ConfigList) ->
     {ok, ConfigListEntry}.
 
@@ -847,9 +855,7 @@ os_info(Info) ->
 	{OsFamily, _OsName} when Info =:= partial ->
 	    lists:flatten(io_lib:format("(~w)", [OsFamily]));
 	{OsFamily, OsName} ->
-	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]));
-	OsFamily ->
-	    lists:flatten(io_lib:format("(~w)", [OsFamily]))
+	    lists:flatten(io_lib:format("(~w/~w)", [OsFamily, OsName]))
     end.
 
 otp_release() ->
@@ -925,6 +931,8 @@ lookup_socket_type(ConfigDB) ->
     case httpd_util:lookup(ConfigDB, socket_type, ip_comm) of
 	ip_comm ->
 	    ip_comm;
+	{Tag, Conf} ->
+	    {Tag, Conf};
 	SSL when (SSL =:= ssl) orelse (SSL =:= essl) ->
 	    SSLTag = 
 		if