Switch "attachment" to "inline" on Content-Disposition

rstoyanchev · rstoyanchev · commit 3a919a48d694 · 2015-11-11T17:14:29.000-05:00
Issue: SPR-13587, SPR-13643
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@@ -380,7 +380,7 @@ private void addContentDispositionHeader(ServletServerHttpRequest request,
 		String extInPathParams = StringUtils.getFilenameExtension(pathParams);
 
 		if (!safeExtension(servletRequest, ext) || !safeExtension(servletRequest, extInPathParams)) {
-			headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=f.txt");
+			headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline;filename=f.txt");
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ private void addContentDispositionHeader(ServletServerHttpRequest request,`
`380`	`380`	`String extInPathParams = StringUtils.getFilenameExtension(pathParams);`
`381`	`381`
`382`	`382`	`if (!safeExtension(servletRequest, ext) \|\| !safeExtension(servletRequest, extInPathParams)) {`
`383`		`- headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=f.txt");`
	`383`	`+ headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline;filename=f.txt");`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`