tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r892625 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java container/webapps/docs/changelog.xml
Date Sun, 20 Dec 2009 17:55:53 GMT
Author: markt
Date: Sun Dec 20 17:55:52 2009
New Revision: 892625

URL: http://svn.apache.org/viewvc?rev=892625&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327
Allow APR/native to work with IPv6

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=892625&r1=892624&r2=892625&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Dec 20 17:55:52 2009
@@ -33,13 +33,6 @@
    0: fhanik - big step for an old branch, could be risky, I'd wait until after next release
if we consider it
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43327
-  Port from 6.0.x
-  Required to investigate 39997
-  http://people.apache.org/~markt/patches/2009-07-12-apr-ipv6.patch
-  +1: markt, kkolinko, rjung
-  -1:
-
 * Minor cleanups for AccessLogValve classes
   Reuses StringBuffer, uses char instead of single-char String, etc.
   http://people.apache.org/~kkolinko/patches/2009-07-15_tc55_ALV.patch

Modified: tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=892625&r1=892624&r2=892625&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Sun Dec 20 17:55:52 2009
@@ -563,7 +563,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/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=892625&r1=892624&r2=892625&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Dec 20 17:55:52 2009
@@ -102,6 +102,10 @@
   <subsection name="Coyote">
     <changelog>
       <fix>
+        <bug>43327</bug>: Allow APR/native connector to work correctly on
+        systems when IPv6 is enabled. (markt)
+      </fix>
+      <fix>
         <bug>46950</bug>: Support SSL renegotiation with APR/native connector.
         Note that this requires APR/native 1.1.17 or later. (markt)
       </fix>



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


Mime
View raw message