Index: src/test/org/apache/commons/httpclient/cookie/TestCookieCompatibilitySpec.java =================================================================== --- src/test/org/apache/commons/httpclient/cookie/TestCookieCompatibilitySpec.java (revision 180130) +++ src/test/org/apache/commons/httpclient/cookie/TestCookieCompatibilitySpec.java (working copy) @@ -1,5 +1,5 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//httpclient/src/test/org/apache/commons/httpclient/cookie/TestCookieCompatibilitySpec.java,v 1.7 2004/09/14 20:11:32 olegk Exp $ + * $HeadURL$ * $Revision$ * $Date$ * ==================================================================== @@ -801,6 +801,15 @@ assertTrue(cookiespec.match("sourceforge.net", 80, "/", false, cookie)); } + public void testInvalidSecondDomainLevelCookieMatch() throws Exception { + Cookie cookie = new Cookie(".sourceforge.net", "name", null, "/", null, false); + cookie.setDomainAttributeSpecified(true); + cookie.setPathAttributeSpecified(true); + + CookieSpec cookiespec = new CookieSpecBase(); + assertFalse(cookiespec.match("antisourceforge.net", 80, "/", false, cookie)); + } + public void testMatchNullHost() throws Exception { CookieSpec cookiespec = new CookieSpecBase(); Cookie cookie = new Cookie(); Index: src/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java =================================================================== --- src/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java (revision 180130) +++ src/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java (working copy) @@ -504,7 +504,7 @@ */ public boolean domainMatch(final String host, final String domain) { return host.endsWith(domain) - || (domain.startsWith(".") && host.endsWith(domain.substring(1))); + || (domain.startsWith(".") && host.equals(domain.substring(1))); } /**