tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r407176 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Date Wed, 17 May 2006 06:33:41 GMT
Author: mturk
Date: Tue May 16 23:33:41 2006
New Revision: 407176

URL: http://svn.apache.org/viewcvs?rev=407176&view=rev
Log:
Use APR_UNSPEC for IPv6 and address=null. Backport from 5.5 branch.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=407176&r1=407175&r2=407176&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 16 23:33:41
2006
@@ -561,9 +561,11 @@
             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);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message