commit 505d890c4f0a89414c427a6e23d98cc07b5f3154
author Yi Kong <yikong@google.com> Mon Jul 04 22:13:50 2016 +0100
committer Yi Kong <yikong@google.com> Tue Jul 05 13:31:28 2016 +0100
tree 8bbe408bc69e228d7dc9c0a0abde77be0d899af5
parent 8945010c1ca3572a07426570a411721ad017752a

Import upstream change: HttpCookie.domainMatches("hostname.local", "hostname") should return true

Upstream change:

    7023713: HttpCookie.domainMatches("hostname.local", "hostname") should return true
    Reviewed-by: chegar
    Contributed-by: zhouyx@linux.vnet.ibm.com

    http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5c1f90dd0405

Bug: 29067535
Test: org.apache.harmony.tests.java.net.HttpCookieTest#test_DomainMatches
Change-Id: I47b59a35e89ddb488554c712a58f645785409bc6

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
index e8d2ba9..3282616 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
@@ -164,6 +164,10 @@
 
         match = HttpCookie.domainMatches(null, "b.a.AJAX.com");
         assertFalse(match);
+
+        // JDK-7023713
+        match = HttpCookie.domainMatches("hostname.local", "hostname");
+        assertTrue(match);
     }
 
     /**

ojluni/src/main/java/java/net/HttpCookie.java

diff --git a/ojluni/src/main/java/java/net/HttpCookie.java b/ojluni/src/main/java/java/net/HttpCookie.java
index 3c80f29..295c926 100755
--- a/ojluni/src/main/java/java/net/HttpCookie.java
+++ b/ojluni/src/main/java/java/net/HttpCookie.java
@@ -693,10 +693,14 @@
             && (embeddedDotInDomain == -1 || embeddedDotInDomain == domain.length() - 1))
             return false;
 
-        // if the host name contains no dot and the domain name is .local
+        // if the host name contains no dot and the domain name
+        // is .local or host.local
         int firstDotInHost = host.indexOf('.');
-        if (firstDotInHost == -1 && isLocalDomain)
+        if (firstDotInHost == -1 &&
+            (isLocalDomain ||
+             domain.equalsIgnoreCase(host + ".local"))) {
             return true;
+        }
 
         int domainLength = domain.length();
         int lengthDiff = host.length() - domainLength;