Author: markt
Date: Fri Sep 19 03:53:41 2008
New Revision: 697046
URL: http://svn.apache.org/viewvc?rev=697046&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327
Socket bind fails when using APR on a system with IPv6 enabled but no explicit
IPv6 address configured.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=697046&r1=697045&r2=697046&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 19 03:53:41 2008
@@ -73,13 +73,6 @@
which to me means adding any sort of sync is not worth it.
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327
- http://svn.apache.org/viewvc?rev=687755&view=rev
- Note use trunk >=r690600 of TC-native to test it as it also needs patches
- there.
- +1: jfclere, remm, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45074
http://svn.apache.org/viewvc?rev=689402&view=rev
+1: jfclere
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=697046&r1=697045&r2=697046&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 Fri
Sep 19 03:53:41 2008
@@ -599,7 +599,8 @@
long inetAddress = Address.info(addressStr, family,
port, 0, rootPool);
// Create the APR server socket
- serverSock = Socket.create(family, Socket.SOCK_STREAM,
+ serverSock = Socket.create(Address.getInfo(inetAddress).family,
+ Socket.SOCK_STREAM,
Socket.APR_PROTO_TCP, rootPool);
if (OS.IS_UNIX) {
Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=697046&r1=697045&r2=697046&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Sep 19 03:53:41 2008
@@ -67,6 +67,10 @@
<subsection name="Coyote">
<changelog>
<fix>
+ <bug>43327</bug>: Socket bind fails when using APR on a system with
IPv6
+ enabled but no explicit IPv6 address configured. (markt/jfclere)
+ </fix>
+ <fix>
<bug>45528</bug>: Add detection for invalid SSL configuration to
prevent
infinite logging loop on start-up. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
