Merge branch '6.0.x' into 6.1.x

Author: marcusdacoregio

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilter.java

@@ -108,7 +108,7 @@ private void writeMetadataToResponse(HttpServletResponse response, Saml2Metadata
 		String fileName = metadata.getFileName();
 		String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name());
 		response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format(format, fileName, encodedFileName));
-		response.setContentLength(metadata.getMetadata().length());
+		response.setContentLength(metadata.getMetadata().getBytes(StandardCharsets.UTF_8).length);
 		response.setCharacterEncoding(StandardCharsets.UTF_8.name());
 		response.getWriter().write(metadata.getMetadata());
 	}

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java

@@ -177,6 +177,8 @@ public void doFilterWhenCharacterEncodingThenEncodeSpecialCharactersCorrectly()
 		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