Merge branch '6.2.x'

This commit is contained in:
Brian Clozel
2025-02-25 17:19:01 +01:00
3 changed files with 30 additions and 17 deletions

View File

@@ -290,6 +290,14 @@ class MockHttpServletResponseTests {
assertThat(response.getLocale()).isEqualTo(Locale.ITALIAN);
}
@Test // gh-34488
void shouldAddMultipleContentLanguage() {
response.addHeader(HttpHeaders.CONTENT_LANGUAGE, "en");
response.addHeader(HttpHeaders.CONTENT_LANGUAGE, "fr");
assertThat(response.getHeaders(HttpHeaders.CONTENT_LANGUAGE)).contains("en", "fr");
assertThat(response.getLocale()).isEqualTo(Locale.ENGLISH);
}
@Test
void contentLengthSetsHeader() {
response.setContentLength(66);
@@ -672,5 +680,4 @@ class MockHttpServletResponseTests {
}
}