Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 42947 invoked from network); 16 May 2006 07:15:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 May 2006 07:15:15 -0000 Received: (qmail 19196 invoked by uid 500); 16 May 2006 07:15:08 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 19137 invoked by uid 500); 16 May 2006 07:15:08 -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 19126 invoked by uid 500); 16 May 2006 07:15:08 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 19122 invoked by uid 99); 16 May 2006 07:15:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 May 2006 00:15:08 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 16 May 2006 00:15:07 -0700 Received: (qmail 42618 invoked by uid 65534); 16 May 2006 07:14:47 -0000 Message-ID: <20060516071447.42617.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r406860 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Date: Tue, 16 May 2006 07:14:46 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Tue May 16 00:14:46 2006 New Revision: 406860 URL: http://svn.apache.org/viewcvs?rev=406860&view=rev Log: Use APR_UNSPEC only if the provided address actually is the IPV6 address. Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=406860&r1=406859&r2=406860&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 Tue May 16 00:14:46 2006 @@ -561,8 +561,10 @@ addressStr = address.getHostAddress(); } int family = Socket.APR_INET; - if (Library.APR_HAVE_IPV6) - family= Socket.APR_UNSPEC; + if (Library.APR_HAVE_IPV6 && addressStr != null) { + if (addressStr.indexOf(':') >= 0) + family= Socket.APR_UNSPEC; + } long inetAddress = Address.info(addressStr, family, port, 0, rootPool); // Create the APR server socket --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org