make it possible to use a file to configure mime types

The documentation specifies that a file can be used to configure
mime types, but currently it isn't working. With this change it
works as documented.

1 files changed, 36 insertions, 5 deletions

diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 342004f19b..260c09036c 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -66,7 +66,8 @@ all() ->
      {group, http_security}, 
      {group, https_security},
      {group, http_reload},
-     {group, https_reload}
+     {group, https_reload},
+     {group, http_mime_types} 
     ].
 
 groups() ->
@@ -89,6 +90,7 @@ groups() ->
      {https_security, [], [{group, security}]},
      {http_reload, [], [{group, reload}]},
      {https_reload, [], [{group, reload}]},
+     {http_mime_types, [], [alias_1_1, alias_1_0, alias_0_9]},
      {limit, [],  [max_clients_1_1, max_clients_1_0, max_clients_0_9]},  
      {reload, [], [non_disturbing_reconfiger_dies,
 		   disturbing_reconfiger_dies,
@@ -192,7 +194,8 @@ init_per_group(Group, Config0)  when  Group == http_basic;
 				      Group == http_auth_api_dets;
 				      Group == http_auth_api_mnesia;
 				      Group == http_security;
-				      Group == http_reload
+				      Group == http_reload;
+                                      Group == http_mime_types
 				      ->
     ok = start_apps(Group),
     init_httpd(Group, [{type, ip_comm} | Config0]);
@@ -236,7 +239,8 @@ end_per_group(Group, _Config)  when  Group == http_basic;
 				     Group == http_auth_api_mnesia;
 				     Group == http_htaccess;
 				     Group == http_security;
-				     Group == http_reload
+				     Group == http_reload;
+                                     Group == http_mime_types
 				     ->
     inets:stop();
 end_per_group(Group, _Config) when  Group == https_basic;
@@ -857,6 +861,24 @@ cgi_chunked_encoding_test(Config) when is_list(Config) ->
 					    ?config(node, Config),
 					    Requests).
 %%-------------------------------------------------------------------------
+alias_1_1() ->
+    [{doc, "Test mod_alias"}].
+
+alias_1_1(Config) when is_list(Config) ->
+    alias([{http_version, "HTTP/1.1"} | Config]).
+
+alias_1_0() ->
+    [{doc, "Test mod_alias"}].
+  
+alias_1_0(Config) when is_list(Config) ->
+    alias([{http_version, "HTTP/1.0"} | Config]).
+
+alias_0_9() ->
+    [{doc, "Test mod_alias"}].
+  
+alias_0_9(Config) when is_list(Config) ->
+    alias([{http_version, "HTTP/0.9"} | Config]).
+
 alias() ->
     [{doc, "Test mod_alias"}].
 
@@ -915,7 +937,6 @@ trace(Config) when is_list(Config) ->
     Cb = ?config(version_cb, Config),
     Cb:trace(?config(type, Config), ?config(port, Config), 
 	     ?config(host, Config), ?config(node, Config)).
-
 %%-------------------------------------------------------------------------
 light() ->
     ["Test light load"].
@@ -1276,22 +1297,26 @@ setup_server_dirs(ServerRoot, DocRoot, DataDir) ->
     CgiDir =  filename:join(ServerRoot, "cgi-bin"),
     AuthDir =  filename:join(ServerRoot, "auth"),
     PicsDir =  filename:join(ServerRoot, "icons"),
+    ConfigDir =  filename:join(ServerRoot, "config"),
 
     ok = file:make_dir(ServerRoot),
     ok = file:make_dir(DocRoot),
     ok = file:make_dir(CgiDir),
     ok = file:make_dir(AuthDir),
     ok = file:make_dir(PicsDir),
+    ok = file:make_dir(ConfigDir),
 
     DocSrc = filename:join(DataDir, "server_root/htdocs"),    
     AuthSrc = filename:join(DataDir, "server_root/auth"),    
     CgiSrc =  filename:join(DataDir, "server_root/cgi-bin"),    
     PicsSrc =  filename:join(DataDir, "server_root/icons"),    
+    ConfigSrc = filename:join(DataDir, "server_root/config"),
     
     inets_test_lib:copy_dirs(DocSrc, DocRoot),
     inets_test_lib:copy_dirs(AuthSrc, AuthDir),
     inets_test_lib:copy_dirs(CgiSrc, CgiDir),
     inets_test_lib:copy_dirs(PicsSrc, PicsDir),
+    inets_test_lib:copy_dirs(ConfigSrc, ConfigDir),
         
     Cgi = case test_server:os_type() of
 	      {win32, _} ->
@@ -1329,7 +1354,8 @@ start_apps(Group) when  Group == http_basic;
 			Group == http_auth_api_mnesia;			
 			Group == https_htaccess;
 			Group == https_security;
-			Group == https_reload->
+			Group == https_reload;
+                        Group == http_mime_types->
     inets_test_lib:start_apps([inets]).
 
 server_start(_, HttpdConfig) ->
@@ -1417,6 +1443,11 @@ server_config(http_security, Config) ->
 server_config(https_security, Config) ->
     ServerRoot = ?config(server_root, Config),
     tl(auth_conf(ServerRoot)) ++ security_conf(ServerRoot) ++ server_config(https, Config);
+server_config(http_mime_types, Config0) ->
+    Config1 = basic_conf() ++  server_config(http, Config0),
+    ServerRoot = ?config(server_root, Config0),
+    MimeTypesFile = filename:join([ServerRoot,"config", "mime.types"]),
+    [{mime_types, MimeTypesFile} | proplists:delete(mime_types, Config1)];
 
 server_config(http, Config) ->
     ServerRoot = ?config(server_root, Config),