You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2006/12/08 19:39:00 UTC
svn commit: r484695 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Author: mrdon
Date: Fri Dec 8 10:38:58 2006
New Revision: 484695
URL: http://svn.apache.org/viewvc?view=rev&rev=484695
Log:
Fixed max file size in file upload to actually limit files
WW-1549
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?view=diff&rev=484695&r1=484694&r2=484695
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java Fri Dec 8 10:38:58 2006
@@ -77,7 +77,8 @@
public void parse(HttpServletRequest servletRequest, String saveDir)
throws IOException {
DiskFileItemFactory fac = new DiskFileItemFactory();
- fac.setSizeThreshold((int)maxSize);
+ // Make sure that the data is written to file
+ fac.setSizeThreshold(0);
if (saveDir != null) {
fac.setRepository(new File(saveDir));
}
@@ -85,6 +86,7 @@
// Parse the request
try {
ServletFileUpload upload = new ServletFileUpload(fac);
+ upload.setSizeMax(maxSize);
List items = upload.parseRequest(createRequestContext(servletRequest));
for (Object item1 : items) {