Merge pull request spring-projects#2370 from bclozel/acceptcharset

snicoll · snicoll · commit dc501dfd2bdf · 2015-01-16T17:54:56.000+01:00
* acceptcharset:
  Disable Accept-Charset Header in String converter
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfiguration.java
@@ -144,7 +144,9 @@ protected static class StringHttpMessageConverterConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		public StringHttpMessageConverter stringHttpMessageConverter() {
-			return new StringHttpMessageConverter(this.encodingProperties.getCharset());
+			StringHttpMessageConverter converter = new StringHttpMessageConverter(this.encodingProperties.getCharset());
+			converter.setWriteAcceptCharset(false);
+			return converter;
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,9 @@ protected static class StringHttpMessageConverterConfiguration {`
`144`	`144`	`@Bean`
`145`	`145`	`@ConditionalOnMissingBean`
`146`	`146`	`public StringHttpMessageConverter stringHttpMessageConverter() {`
`147`		`- return new StringHttpMessageConverter(this.encodingProperties.getCharset());`
	`147`	`+ StringHttpMessageConverter converter = new StringHttpMessageConverter(this.encodingProperties.getCharset());`
	`148`	`+ converter.setWriteAcceptCharset(false);`
	`149`	`+ return converter;`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`}`