Skip to content

Commit cba1fd6

Browse files
authored
Fix #9685 Date is not a content header (#9687)
resetContent does not reset Date Header Signed-off-by: gregw <[email protected]>
1 parent 96d2977 commit cba1fd6

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

jetty-server/src/main/java/org/eclipse/jetty/server/Response.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,6 @@ public void resetContent()
12531253
case LAST_MODIFIED:
12541254
case EXPIRES:
12551255
case ETAG:
1256-
case DATE:
12571256
case VARY:
12581257
i.remove();
12591258
continue;

jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public void test404NoAccept() throws Exception
154154
assertThat("Response status code", response.getStatus(), is(404));
155155
assertThat("Response Content-Length", response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
156156
assertThat("Response Content-Type", response.get(HttpHeader.CONTENT_TYPE), containsString("text/html;charset=ISO-8859-1"));
157+
assertThat(response.get(HttpHeader.DATE), notNullValue());
157158
assertThat(response.getContent(), containsString("content=\"text/html;charset=ISO-8859-1\""));
158159

159160
assertContent(response);

jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,6 +2090,7 @@ public void testResetContent() throws Exception
20902090
response.setContentType("some/type");
20912091
response.setContentLength(3);
20922092
response.setHeader(HttpHeader.EXPIRES, "never");
2093+
response.setHeader(HttpHeader.DATE, "2000-01-01");
20932094

20942095
response.setHeader("SomeHeader", "SomeValue");
20952096

@@ -2106,6 +2107,7 @@ public void testResetContent() throws Exception
21062107

21072108
// check arbitrary header still set
21082109
assertThat(response.getHeader("SomeHeader"), is("SomeValue"));
2110+
assertThat(response.getHeader("Date"), is("2000-01-01"));
21092111

21102112
// check cookies are still there
21112113
Enumeration<String> set = response.getHttpFields().getValues("Set-Cookie");

0 commit comments

Comments
 (0)