From bac68c8d3f9ca4caa70b54c14e0e9805f88f8d34 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Thu, 28 Jun 2018 13:32:51 +0200
Subject: [PATCH] StandardServletMultipartResolver accepts any HTTP method for
 multipart

Issue: SPR-16975
---
 .../StandardServletMultipartResolver.java     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
index 34d40edb19..bc7380773d 100644
--- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
@@ -43,13 +43,12 @@ import org.springframework.web.multipart.MultipartResolver;
  *
  * <pre class="code">
  * public class AppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
- *	// ...
- *	&#064;Override
- *	protected void customizeRegistration(ServletRegistration.Dynamic registration) {
- *
- *		// Optionally also set maxFileSize, maxRequestSize, fileSizeThreshold
- *		registration.setMultipartConfig(new MultipartConfigElement("/tmp"));
- *	}
+ *	 // ...
+ *	 &#064;Override
+ *	 protected void customizeRegistration(ServletRegistration.Dynamic registration) {
+ *     // Optionally also set maxFileSize, maxRequestSize, fileSizeThreshold
+ *     registration.setMultipartConfig(new MultipartConfigElement("/tmp"));
+ *   }
  * }
  * </pre>
  *
@@ -80,12 +79,7 @@ public class StandardServletMultipartResolver implements MultipartResolver {
 
 	@Override
 	public boolean isMultipart(HttpServletRequest request) {
-		// Same check as in Commons FileUpload...
-		if (!"post".equalsIgnoreCase(request.getMethod())) {
-			return false;
-		}
-		String contentType = request.getContentType();
-		return StringUtils.startsWithIgnoreCase(contentType, "multipart/");
+		return StringUtils.startsWithIgnoreCase(request.getContentType(), "multipart/");
 	}
 
 	@Override