From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 3 Apr 2007 10:47:06 +0000 (+0000)
Subject: Fix #41973 by not initializing IPV6 if address is null.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a7c9d466c3ea1721ba420b2e7188fd2998df785b;p=tomcat7.0

Fix #41973 by not initializing IPV6 if address is null.
APR cannot listen both on IPV4 and IPV6 on some platforms
(e.g BSD and Windows).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@525133 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 0706804c4..8969acdfd 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -596,9 +596,6 @@ public class AprEndpoint {
             }
          }
 
-        if (Library.APR_HAVE_IPV6 && (addressStr == null || addressStr.indexOf(':') >= 0)) {
-            family = Socket.APR_UNSPEC;
-        }
         long inetAddress = Address.info(addressStr, family,
                 port, 0, rootPool);
         // Create the APR server socket