You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2006/05/16 15:45:45 UTC
svn commit: r406942 -
/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r406942 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Posted by Markus Schönhaber <ma...@schoenhaber.de>.
Mladen Turk wrote:
> I will. Just needed a second confirmation if it's working as expected.
Oops, sorry for the noise.
Regards
mks
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r406942 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Posted by Mladen Turk <mt...@apache.org>.
Markus Schönhaber wrote:
>
> You might also want to change
> tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
>
I will. Just needed a second confirmation if it's working as expected.
Regards,
Mladen.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r406942 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Posted by Markus Schönhaber <ma...@schoenhaber.de>.
mturk@apache.org wrote:
> Modified:
> tomcat/connectors/trunk/util/java/org/apache/tomcat/util/net/AprEndpoint.ja
Thanks, Mladen.
You might also want to change
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
Regards
mks
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org