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 99a2140..d9a0762 100644 (file)
--- 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();\r
         }\r
         int family = Socket.APR_INET;\r
-        if (Library.APR_HAVE_IPV6 && addressStr != null) {\r
-            if (addressStr.indexOf(':') >= 0)\r
-                family= Socket.APR_UNSPEC;\r
+        if (Library.APR_HAVE_IPV6) {\r
+            if (addressStr == null)\r
+                family = Socket.APR_UNSPEC;\r
+            else if (addressStr.indexOf(':') >= 0)\r
+                family = Socket.APR_UNSPEC;\r
         }\r
         long inetAddress = Address.info(addressStr, family,\r
                 port, 0, rootPool);\r