From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 May 2006 06:33:41 +0000 (+0000)
Subject: Use APR_UNSPEC for IPv6 and address=null. Backport from 5.5 branch.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e9f1593474b121bcc70b7af924cd33e95a3e1922;p=tomcat7.0

Use APR_UNSPEC for IPv6 and address=null. Backport from 5.5 branch.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@407176 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 99a214010..d9a0762f7 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -561,9 +561,11 @@ public class AprEndpoint {
             addressStr = address.getHostAddress();
         }
         int family = Socket.APR_INET;
-        if (Library.APR_HAVE_IPV6 && addressStr != null) {
-            if (addressStr.indexOf(':') >= 0)
-                family= Socket.APR_UNSPEC;
+        if (Library.APR_HAVE_IPV6) {
+            if (addressStr == null)
+                family = Socket.APR_UNSPEC;
+            else if (addressStr.indexOf(':') >= 0)
+                family = Socket.APR_UNSPEC;
         }
         long inetAddress = Address.info(addressStr, family,
                 port, 0, rootPool);