Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 68141 invoked from network); 20 Dec 2009 17:56:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 20 Dec 2009 17:56:21 -0000 Received: (qmail 28492 invoked by uid 500); 20 Dec 2009 17:56:20 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 28407 invoked by uid 500); 20 Dec 2009 17:56:20 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 28396 invoked by uid 99); 20 Dec 2009 17:56:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2009 17:56:20 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Dec 2009 17:56:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E2FC238898B; Sun, 20 Dec 2009 17:55:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091220175553.6E2FC238898B@eris.apache.org> 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 @@ + 43327: Allow APR/native connector to work correctly on + systems when IPv6 is enabled. (markt) + + 46950: Support SSL renegotiation with APR/native connector. Note that this requires APR/native 1.1.17 or later. (markt) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org