Correctly identify MaxUploadSizeExceededException in StandardMultipartHttpServletRequest

kacperkrzyzak · sbrannen · commit 10838a636fbb · 2022-07-13T13:17:53.000+02:00
This commit correctly identifies MaxUploadSizeExceededException in StandardMultipartHttpServletRequest by converting keywords in the exception message to lowercase before checking for their presence, for compatibility with Jetty 9.4.x. Closes gh-28759
diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
@@ -118,8 +118,11 @@ private void parseRequest(HttpServletRequest request) {
 
 	protected void handleParseFailure(Throwable ex) {
 		String msg = ex.getMessage();
-		if (msg != null && msg.contains("size") && msg.contains("exceed")) {
-			throw new MaxUploadSizeExceededException(-1, ex);
+		if (msg != null) {
+			msg = msg.toLowerCase();
+			if (msg.contains("size") && msg.contains("exceed")) {
+				throw new MaxUploadSizeExceededException(-1, ex);
+			}
 		}
 		throw new MultipartException("Failed to parse multipart servlet request", ex);
 	}

Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,11 @@ private void parseRequest(HttpServletRequest request) {`
`118`	`118`
`119`	`119`	`protected void handleParseFailure(Throwable ex) {`
`120`	`120`	`String msg = ex.getMessage();`
`121`		`- if (msg != null && msg.contains("size") && msg.contains("exceed")) {`
`122`		`- throw new MaxUploadSizeExceededException(-1, ex);`
	`121`	`+ if (msg != null) {`
	`122`	`+ msg = msg.toLowerCase();`
	`123`	`+ if (msg.contains("size") && msg.contains("exceed")) {`
	`124`	`+ throw new MaxUploadSizeExceededException(-1, ex);`
	`125`	`+ }`
`123`	`126`	`}`
`124`	`127`	`throw new MultipartException("Failed to parse multipart servlet request", ex);`
`125`	`128`	`}`