376324 <max-file-size> is not respected in <multipart-config>

2012-04-10 15:03:38 +10:00 · 2012-04-10 15:03:38 +10:00 · 62713fda2f
parent ec77ba41ef
commit 62713fda2f
1 changed files with 6 additions and 2 deletions
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
@ -587,10 +587,14 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
            // Handle run as
            if (_identityService!=null)
                old_run_as=_identityService.setRunAs(baseRequest.getResolvedUserIdentity(),_runAsToken);
-            
+
            if (!isAsyncSupported())
                baseRequest.setAsyncSupported(false);
-            
+
+            MultipartConfigElement mpce = ((Registration)getRegistration()).getMultipartConfig();
+            if (mpce != null)
+                request.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, mpce);
+
            servlet.service(request,response);
            servlet_error=false;
        }