Author: mturk
Date: Tue May 16 06:45:44 2006
New Revision: 406942
URL: http://svn.apache.org/viewcvs?rev=406942&view=rev
Log:
Use APR_UNSPEC for IPv6 and address=null.
Thanks to Markus Schönhaber for spotting that.
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Modified:
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=406942&r1=406941&r2=406942&view=diff
==============================================================================
---
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Tue May 16 06:45:44 2006
@@ -553,9 +553,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
