Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 23563 invoked from network); 3 Nov 2009 16:58:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Nov 2009 16:58:48 -0000 Received: (qmail 86621 invoked by uid 500); 3 Nov 2009 16:58:48 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 86569 invoked by uid 500); 3 Nov 2009 16:58:48 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 86560 invoked by uid 99); 3 Nov 2009 16:58:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2009 16:58:47 +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; Tue, 03 Nov 2009 16:58:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BDD122388962; Tue, 3 Nov 2009 16:58:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832474 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java Date: Tue, 03 Nov 2009 16:58:24 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091103165824.BDD122388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Tue Nov 3 16:58:24 2009 New Revision: 832474 URL: http://svn.apache.org/viewvc?rev=832474&view=rev Log: If the hostname has been resolved use the canonical name for the security check. Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java?rev=832474&r1=832473&r2=832474&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/URL.java Tue Nov 3 16:58:24 2009 @@ -705,7 +705,9 @@ SecurityManager sm = System.getSecurityManager(); if (sm != null && proxy.type() != Proxy.Type.DIRECT) { InetSocketAddress pAddress = (InetSocketAddress) proxy.address(); - sm.checkConnect(pAddress.getHostName(), pAddress.getPort()); + String pHostName = pAddress.isUnresolved() ? pAddress.getHostName() + : pAddress.getAddress().getHostAddress(); + sm.checkConnect(pHostName, pAddress.getPort()); } return strmHandler.openConnection(this, proxy);