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

SPR-6247 - Multipart Content-Type charset is ignored in CommonsFileUploadSupport.

Browse Source
This commit is contained in:
Arjen Poutsma
2009-10-27 11:42:36 +00:00
parent d54a975af4
commit d0893c425e
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
View File

@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.nio.charset.Charset;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
@@ -36,6 +37,7 @@ import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.util.WebUtils;
import org.springframework.http.MediaType;
/**
* Base class for multipart resolvers that use Jakarta Commons FileUpload
@@ -221,14 +223,15 @@ public abstract class CommonsFileUploadSupport {
for (FileItem fileItem : fileItems) {
if (fileItem.isFormField()) {
String value;
if (encoding != null) {
String partEncoding = determineEncoding(fileItem.getContentType(), encoding);
if (partEncoding != null) {
try {
value = fileItem.getString(encoding);
value = fileItem.getString(partEncoding);
}
catch (UnsupportedEncodingException ex) {
if (logger.isWarnEnabled()) {
logger.warn("Could not decode multipart item '" + fileItem.getFieldName() +
"' with encoding '" + encoding + "': using platform default");
"' with encoding '" + partEncoding + "': using platform default");
}
value = fileItem.getString();
}
@@ -281,6 +284,15 @@ public abstract class CommonsFileUploadSupport {
}
}
private String determineEncoding(String contentTypeHeader, String defaultEncoding) {
if (!StringUtils.hasText(contentTypeHeader)) {
return defaultEncoding;
}
MediaType contentType = MediaType.parseMediaType(contentTypeHeader);
Charset charset = contentType.getCharSet();
return charset != null ? charset.name() : defaultEncoding;
}
/**
* Holder for a Map of Spring MultipartFiles and a Map of