Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-923: NetscapeDraftSpec to allow two digit year in the expiry attribute 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@919394 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2010-03-05 12:46:10 +00:00
parent 635f952f48
commit 1387923be8
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
View File

@ -55,7 +55,7 @@ import org.apache.http.util.CharArrayBuffer;
@NotThreadSafe // superclass is @NotThreadSafe
public class NetscapeDraftSpec extends CookieSpecBase {
protected static final String EXPIRES_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
protected static final String EXPIRES_PATTERN = "EEE, dd-MMM-yy HH:mm:ss z";
private final String[] datepatterns;

41
httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java
View File

@ -28,6 +28,7 @@
package org.apache.http.impl.cookie;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import junit.framework.Test;
@ -44,8 +45,6 @@ import org.apache.http.message.BasicHeader;
/**
* Test cases for Netscape cookie draft
*
*
*/
public class TestCookieNetscapeDraft extends TestCase {
@ -166,10 +165,44 @@ public class TestCookieNetscapeDraft extends TestCase {
CookieOrigin origin = new CookieOrigin("myhost.mydomain.com", 80, "/", false);
List<Cookie> cookies = cookiespec.parse(header, origin);
cookiespec.validate(cookies.get(0), origin);
header = new BasicHeader("Set-Cookie",
assertNotNull(cookies);
assertEquals(1, cookies.size());
Cookie cookie = cookies.get(0);
Calendar c = Calendar.getInstance();
c.setTime(cookie.getExpiryDate());
int year = c.get(Calendar.YEAR);
assertEquals(2070, year);
}
/**
* Expire attribute with two digit year.
*/
public void testNetscapeCookieExpireAttributeTwoDigitYear() throws Exception {
CookieSpec cookiespec = new NetscapeDraftSpec();
Header header = new BasicHeader("Set-Cookie",
"name=value; path=/; domain=.mydomain.com; expires=Thursday, 01-Jan-70 00:00:10 GMT; comment=no_comment");
CookieOrigin origin = new CookieOrigin("myhost.mydomain.com", 80, "/", false);
List<Cookie> cookies = cookiespec.parse(header, origin);
cookiespec.validate(cookies.get(0), origin);
assertNotNull(cookies);
assertEquals(1, cookies.size());
Cookie cookie = cookies.get(0);
Calendar c = Calendar.getInstance();
c.setTime(cookie.getExpiryDate());
int year = c.get(Calendar.YEAR);
assertEquals(2070, year);
}
/**
* Invalid expire attribute.
*/
public void testNetscapeCookieInvalidExpireAttribute() throws Exception {
CookieSpec cookiespec = new NetscapeDraftSpec();
CookieOrigin origin = new CookieOrigin("myhost.mydomain.com", 80, "/", false);
Header header = new BasicHeader("Set-Cookie",
"name=value; path=/; domain=.mydomain.com; expires=Thu 01-Jan-2070 00:00:10 GMT; comment=no_comment");
try {
cookies = cookiespec.parse(header, origin);
List<Cookie> cookies = cookiespec.parse(header, origin);
cookiespec.validate(cookies.get(0), origin);
fail("MalformedCookieException exception should have been thrown");
} catch (MalformedCookieException e) {