1 files changed, 33 insertions, 5 deletions

diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 5b8b1463c8..1e664337e6 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -33,7 +33,7 @@ suite() ->
 
 all() -> 
     [default_tree, ftpc_worker, tftpd_worker, 
-     httpd_subtree, httpd_subtree_profile,
+     httpd_config, httpd_subtree, httpd_subtree_profile,
      httpc_subtree].
 
 groups() -> 
@@ -52,9 +52,32 @@ end_per_suite(_) ->
     inets:stop(),
     ok.
 
-init_per_testcase(httpd_subtree, Config) ->
+init_per_testcase(httpd_config = TC, Config) ->
+    PrivDir = proplists:get_value(priv_dir, Config),
+    Dir = filename:join(PrivDir, TC),
+    ok = file:make_dir(Dir),
+
+    FallbackConfig = [{port, 0},
+		      {server_name,"www.test"},
+		      {modules, [mod_get]},
+		      {server_root, Dir},
+		      {document_root, Dir},
+		      {bind_address, any},
+		      {ipfamily, inet6fb4}],
+    try
+	inets:stop(),
+	inets:start(),
+	inets:start(httpd, FallbackConfig),
+	Config
+    catch
+	_:Reason ->
+	    inets:stop(),
+	    exit({failed_starting_inets, Reason})
+    end;
+
+init_per_testcase(httpd_subtree = TC, Config) ->
     PrivDir = proplists:get_value(priv_dir, Config), 			   
-    Dir = filename:join(PrivDir, "root"),
+    Dir = filename:join(PrivDir, TC),
     ok = file:make_dir(Dir),
 
     SimpleConfig  = [{port, 0},
@@ -75,9 +98,9 @@ init_per_testcase(httpd_subtree, Config) ->
 	    exit({failed_starting_inets, Reason})
     end;
 
-init_per_testcase(httpd_subtree_profile, Config) ->
+init_per_testcase(httpd_subtree_profile = TC, Config) ->
     PrivDir = proplists:get_value(priv_dir, Config), 			   
-    Dir = filename:join(PrivDir, "root"),
+    Dir = filename:join(PrivDir, TC),
     ok = file:make_dir(Dir),
 
     SimpleConfig  = [{port, 0},
@@ -193,6 +216,11 @@ tftpd_worker(Config) when is_list(Config) ->
     [] = supervisor:which_children(tftp_sup),
     ok.
 
+httpd_config() ->
+    [{doc, "Makes sure the httpd config works for inet6fb4."}].
+httpd_config(Config) when is_list(Config) ->
+    do_httpd_subtree(Config, default).
+
 httpd_subtree() ->
     [{doc, "Makes sure the httpd sub tree is correct."}].
 httpd_subtree(Config) when is_list(Config) ->