root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #2370 from bclozel/acceptcharset 

* acceptcharset:
  Disable Accept-Charset Header in String converter
This commit is contained in:
Stephane Nicoll 2015-01-16 17:54:56 +01:00
parent ff2d423fcb 6d60c23460
commit dc501dfd2b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java
View File

@ -144,7 +144,9 @@ public class HttpMessageConvertersAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public StringHttpMessageConverter stringHttpMessageConverter() { public StringHttpMessageConverter stringHttpMessageConverter() {
return new StringHttpMessageConverter(this.encodingProperties.getCharset()); StringHttpMessageConverter converter = new StringHttpMessageConverter(this.encodingProperties.getCharset());
converter.setWriteAcceptCharset(false);
return converter;
} }
} }