Skip to content
Permalink
Browse files

Return -1 after parse error for Expires header

Issue: SPR-10648
  • Loading branch information...
rstoyanchev committed Aug 5, 2013
1 parent 58bfd1a commit 9245fffcaf42d5ec8a2485c14440b72d71cdd2ec
@@ -391,12 +391,20 @@ public void setExpires(long expires) {
}

/**
* Returns the date and time at which the message is no longer valid, as specified by the {@code Expires} header.
* <p>The date is returned as the number of milliseconds since January 1, 1970 GMT. Returns -1 when the date is unknown.
* Returns the date and time at which the message is no longer valid, as specified by
* the {@code Expires} header.
* <p>The date is returned as the number of milliseconds since January 1, 1970 GMT.
* Returns -1 when the date is unknown.
*
* @return the expires value
*/
public long getExpires() {
return getFirstDate(EXPIRES);
try {
return getFirstDate(EXPIRES);
}
catch (IllegalArgumentException ex) {
return -1;
}
}

/**
@@ -210,6 +210,14 @@ public void expires() {
assertEquals("Invalid Expires header", "Thu, 18 Dec 2008 10:20:00 GMT", headers.getFirst("expires"));
}

// SPR-10648 (example is from INT-3063)

@Test
public void expiresInvalidDate() {
headers.set("Expires", "-1");
assertEquals(-1, headers.getExpires());
}

@Test
public void ifModifiedSince() {
Calendar calendar = new GregorianCalendar(2008, 11, 18, 11, 20);

0 comments on commit 9245fff

Please sign in to comment.
You can’t perform that action at this time.