Bugfix: Missing ipv6 support check

Felipe Zimmerle · Felipe Zimmerle · commit 80185e2a9021 · 2014-03-31T16:22:10.000-07:00
The Function "ip_tree_from_file" was making a reference for
IPV6_TREE whitout checkingx if it was supported or not.
diff --git a/apache2/msc_util.c b/apache2/msc_util.c
@@ -2547,11 +2547,12 @@ int ip_tree_from_file(TreeRoot **rtree_, char *uri,
         {
             tnode = TreeAddIP(start, rtree->ipv4_tree, IPV4_TREE);
         }
+#if APR_HAVE_IPV6
         else
         {
             tnode = TreeAddIP(start, rtree->ipv6_tree, IPV6_TREE);
         }
-
+#endif
         if (tnode == NULL)
         {
             *error_msg = apr_psprintf(mp, "Could not add entry " \

Original file line number	Diff line number	Diff line change
`@@ -2547,11 +2547,12 @@ int ip_tree_from_file(TreeRoot *rtree_, char uri,`
`2547`	`2547`	`{`
`2548`	`2548`	`tnode = TreeAddIP(start, rtree->ipv4_tree, IPV4_TREE);`
`2549`	`2549`	`}`
	`2550`	`+#if APR_HAVE_IPV6`
`2550`	`2551`	`else`
`2551`	`2552`	`{`
`2552`	`2553`	`tnode = TreeAddIP(start, rtree->ipv6_tree, IPV6_TREE);`
`2553`	`2554`	`}`
`2554`		`-`
	`2555`	`+#endif`
`2555`	`2556`	`if (tnode == NULL)`
`2556`	`2557`	`{`
`2557`	`2558`	`*error_msg = apr_psprintf(mp, "Could not add entry " \`