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

Lenient handling of empty Content-Disposition filename

Browse Source 
Closes gh-25769
This commit is contained in:
Juergen Hoeller
2020-09-14 22:16:12 +02:00
parent 49d65d5c41
commit c2f6a98c90
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -861,7 +861,7 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
public void setContentDispositionFormData(String name, @Nullable String filename) { public void setContentDispositionFormData(String name, @Nullable String filename) {
Assert.notNull(name, "Name must not be null"); Assert.notNull(name, "Name must not be null");
ContentDisposition.Builder disposition = ContentDisposition.builder("form-data").name(name); ContentDisposition.Builder disposition = ContentDisposition.builder("form-data").name(name);
if (filename != null) { if (StringUtils.hasText(filename)) {
disposition.filename(filename); disposition.filename(filename);
} }
setContentDisposition(disposition.build()); setContentDisposition(disposition.build());
@@ -888,7 +888,7 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
*/ */
public ContentDisposition getContentDisposition() { public ContentDisposition getContentDisposition() {
String contentDisposition = getFirst(CONTENT_DISPOSITION); String contentDisposition = getFirst(CONTENT_DISPOSITION);
if (contentDisposition != null) { if (StringUtils.hasText(contentDisposition)) {
return ContentDisposition.parse(contentDisposition); return ContentDisposition.parse(contentDisposition);
} }
return ContentDisposition.empty(); return ContentDisposition.empty();