Merge branch '5.8.x' into 6.0.x
This commit is contained in:
commit
1a0b8b7994
|
@ -88,7 +88,7 @@ public final class Saml2MetadataFilter extends OncePerRequestFilter {
|
|||
String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name());
|
||||
String format = "attachment; filename=\"%s\"; filename*=UTF-8''%s";
|
||||
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format(format, fileName, encodedFileName));
|
||||
response.setContentLength(metadata.length());
|
||||
response.setContentLength(metadata.getBytes(StandardCharsets.UTF_8).length);
|
||||
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
|
||||
response.getWriter().write(metadata);
|
||||
}
|
||||
|
|
|
@ -165,6 +165,8 @@ public class Saml2MetadataFilterTests {
|
|||
this.filter.doFilter(this.request, this.response, this.chain);
|
||||
assertThat(this.response.getCharacterEncoding()).isEqualTo(StandardCharsets.UTF_8.name());
|
||||
assertThat(this.response.getContentAsString(StandardCharsets.UTF_8)).isEqualTo(generatedMetadata);
|
||||
assertThat(this.response.getContentLength())
|
||||
.isEqualTo(generatedMetadata.getBytes(StandardCharsets.UTF_8).length);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue