Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 9526 invoked from network); 7 Jan 2011 17:49:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jan 2011 17:49:42 -0000 Received: (qmail 98816 invoked by uid 500); 7 Jan 2011 17:49:41 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 98737 invoked by uid 500); 7 Jan 2011 17:49:41 -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 98728 invoked by uid 99); 7 Jan 2011 17:49:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Jan 2011 17:49:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Fri, 07 Jan 2011 17:49:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B84E12388903; Fri, 7 Jan 2011 17:49:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1056414 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11AprProcessor.java webapps/docs/changelog.xml Date: Fri, 07 Jan 2011 17:49:20 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110107174920.B84E12388903@eris.apache.org> Author: markt Date: Fri Jan 7 17:49:20 2011 New Revision: 1056414 URL: http://svn.apache.org/viewvc?rev=1056414&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 Return IP address rather than null for getRemoteHost() and the APR connector Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.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=1056414&r1=1056413&r2=1056414&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 7 17:49:20 2011 @@ -275,12 +275,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, fhanik, funkman -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47319 - Return IP address rather than null for getRemoteHost() and the APR connector - http://people.apache.org/~markt/patches/2011-01-06-bug47319-tc6.patch - +1: markt, fhanik, funkman - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50550 Requests for a newly created directory using MKCOL should not result in a 404 http://svn.apache.org/viewvc?rev=1055975&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1056414&r1=1056413&r2=1056414&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Fri Jan 7 17:49:20 2011 @@ -1084,6 +1084,9 @@ public class Http11AprProcessor implemen try { long sa = Address.get(Socket.APR_REMOTE, socket); remoteHost = Address.getnameinfo(sa, 0); + if (remoteHost == null) { + remoteHost = Address.getip(sa); + } } catch (Exception e) { log.warn(sm.getString("http11processor.socket.info"), e); } 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=1056414&r1=1056413&r2=1056414&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 7 17:49:20 2011 @@ -192,6 +192,11 @@ + 47913: Return the IP address rather than null for + getRemoteHost() with the APR connector if the IP address + does not resolve. (markt) + + Avoid a NPE for APR connector unlockAccept with default soTimeout. (mturk) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org