Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch writeAcceptCharset to false by default

Browse Source 
Closes gh-22506
This commit is contained in:
Rossen Stoyanchev
2019-05-08 09:56:52 -04:00
parent a9f0eae4ab
commit 7e6e3d7027
9 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
View File

@@ -117,11 +117,8 @@ public class FormHttpMessageConverter implements HttpMessageConverter<MultiValue
this.supportedMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
this.supportedMediaTypes.add(MediaType.MULTIPART_FORM_DATA);
StringHttpMessageConverter stringHttpMessageConverter = new StringHttpMessageConverter();
stringHttpMessageConverter.setWriteAcceptCharset(false); // see SPR-7316
this.partConverters.add(new ByteArrayHttpMessageConverter());
this.partConverters.add(stringHttpMessageConverter);
this.partConverters.add(new StringHttpMessageConverter());
this.partConverters.add(new ResourceHttpMessageConverter());
applyDefaultCharset();

3
spring-web/src/main/java/org/springframework/http/converter/ObjectToStringHttpMessageConverter.java
View File

@@ -81,8 +81,7 @@ public class ObjectToStringHttpMessageConverter extends AbstractHttpMessageConve
/**
* Indicates whether the {@code Accept-Charset} should be written to any outgoing request.
* <p>Default is {@code true}.
* Delegates to {@link StringHttpMessageConverter#setWriteAcceptCharset(boolean)}.
*/
public void setWriteAcceptCharset(boolean writeAcceptCharset) {
this.stringHttpMessageConverter.setWriteAcceptCharset(writeAcceptCharset);

4
spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
View File

@@ -52,7 +52,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
@Nullable
private volatile List<Charset> availableCharsets;
private boolean writeAcceptCharset = true;
private boolean writeAcceptCharset = false;
/**
@@ -76,7 +76,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
* Whether the {@code Accept-Charset} header should be written to any outgoing
* request sourced from the value of {@link Charset#availableCharsets()}.
* The behavior is suppressed if the header has already been set.
* <p>Default is {@code true}.
* <p>As of 5.2, by default is set to {@code false}.
*/
public void setWriteAcceptCharset(boolean writeAcceptCharset) {
this.writeAcceptCharset = writeAcceptCharset;