spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Optimal charset handling in AbstractHttpMessageConverter

Browse Source 
Closes gh-36320
This commit is contained in:
rstoyanchev
2026-02-23 15:44:26 +00:00
parent 2d81a9fe9b
commit 9042682b56
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java
+3 -2
View File
@@ -254,13 +254,14 @@ public abstract class AbstractHttpMessageConverter<T> implements HttpMessageConv
contentTypeToUse = (mediaType != null ? mediaType : contentTypeToUse);
}
if (contentTypeToUse != null) {
String value = contentTypeToUse.toString();
if (contentTypeToUse.getCharset() == null) {
Charset defaultCharset = getDefaultCharset();
if (defaultCharset != null) {
contentTypeToUse = new MediaType(contentTypeToUse, defaultCharset);
value += ";charset=" + defaultCharset.name();
}
}
headers.setContentType(contentTypeToUse);
headers.set(HttpHeaders.CONTENT_TYPE, value);
}
}
if (headers.getContentLength() < 0 && !headers.containsKey(HttpHeaders.TRANSFER_ENCODING)) {