CommonsFileUploadSupport applies maxUploadSizePerFile to FileUpload copy as well

jhoeller · jhoeller · commit a1bf941ec428 · 2015-11-08T20:21:39.000+01:00
Issue: SPR-13653
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java
@@ -211,6 +211,7 @@ protected FileUpload prepareFileUpload(String encoding) {
 		if (encoding != null && !encoding.equals(fileUpload.getHeaderEncoding())) {
 			actualFileUpload = newFileUpload(getFileItemFactory());
 			actualFileUpload.setSizeMax(fileUpload.getSizeMax());
+			actualFileUpload.setFileSizeMax(fileUpload.getFileSizeMax());
 			actualFileUpload.setHeaderEncoding(encoding);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,7 @@ protected FileUpload prepareFileUpload(String encoding) {`
`211`	`211`	`if (encoding != null && !encoding.equals(fileUpload.getHeaderEncoding())) {`
`212`	`212`	`actualFileUpload = newFileUpload(getFileItemFactory());`
`213`	`213`	`actualFileUpload.setSizeMax(fileUpload.getSizeMax());`
	`214`	`+ actualFileUpload.setFileSizeMax(fileUpload.getFileSizeMax());`
`214`	`215`	`actualFileUpload.setHeaderEncoding(encoding);`
`215`	`216`	`}`
`216`	`217`