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

SPR-7869 - Accept-Charset header with '*' results in java.nio.charset.IllegalCharsetNameException

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3897 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma
2011-01-10 11:24:48 +00:00
parent f49c52cda0
commit 746167be6f
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web/src/main/java/org/springframework/http/HttpHeaders.java
+6 -2
View File
@@ -177,11 +177,15 @@ public class HttpHeaders implements MultiValueMap<String, String> {
String[] tokens = value.split(",\\s*");
for (String token : tokens) {
int paramIdx = token.indexOf(';');
String charsetName;
if (paramIdx == -1) {
result.add(Charset.forName(token));
charsetName = token;
}
else {
result.add(Charset.forName(token.substring(0, paramIdx)));
charsetName = token.substring(0, paramIdx);
}
if (!charsetName.equals("*")) {
result.add(Charset.forName(charsetName));
}
}
}