Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file" 

This reverts commit 734d18fb93.
This commit is contained in:
Jan Bartel 2016-02-03 11:59:31 +01:00
parent 6c9a444b6c
commit d151143556
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
View File

@ -40,7 +40,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import javax.servlet.MultipartConfigElement; import javax.servlet.MultipartConfigElement;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.http.Part; import javax.servlet.http.Part;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -113,7 +112,7 @@ public class MultiPartInputStreamParser
if (MultiPartInputStreamParser.this._config.getMaxFileSize() > 0 && _size + 1 > MultiPartInputStreamParser.this._config.getMaxFileSize()) if (MultiPartInputStreamParser.this._config.getMaxFileSize() > 0 && _size + 1 > MultiPartInputStreamParser.this._config.getMaxFileSize())
throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize"); throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize");
if (_file == null && MultiPartInputStreamParser.this.isFileNeeded(_size + 1)) if (MultiPartInputStreamParser.this._config.getFileSizeThreshold() > 0 && _size + 1 > MultiPartInputStreamParser.this._config.getFileSizeThreshold() && _file==null)
createFile(); createFile();
_out.write(b); _out.write(b);
@ -126,7 +125,7 @@ public class MultiPartInputStreamParser
if (MultiPartInputStreamParser.this._config.getMaxFileSize() > 0 && _size + length > MultiPartInputStreamParser.this._config.getMaxFileSize()) if (MultiPartInputStreamParser.this._config.getMaxFileSize() > 0 && _size + length > MultiPartInputStreamParser.this._config.getMaxFileSize())
throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize"); throw new IllegalStateException ("Multipart Mime part "+_name+" exceeds max filesize");
if (_file == null && MultiPartInputStreamParser.this.isFileNeeded(_size + length)) if (MultiPartInputStreamParser.this._config.getFileSizeThreshold() > 0 && _size + length > MultiPartInputStreamParser.this._config.getFileSizeThreshold() && _file==null)
createFile(); createFile();
_out.write(bytes, offset, length); _out.write(bytes, offset, length);
@ -430,31 +429,6 @@ public class MultiPartInputStreamParser
} }
/**
* Test to determine if the file content sizes exceeds the {@link MultipartConfig#fileSizeThreshold()}
* necessary to produce a file on disk
* <p>
* Configured {@link MultipartConfig#fileSizeThreshold()} of <code>0</code> is always true, negative is always false,
* all other configurations are tested against <code>size</code> parameter
*
* @param size the file size to test against.
* @return true if file is needed, false otherwise
*/
protected boolean isFileNeeded(long size)
{
if (_config.getFileSizeThreshold() < 0)
{
// Negative file size threshold means no file, ever
return false;
}
if (_config.getFileSizeThreshold() == 0)
{
// 0 means always create a file
return true;
}
return size > _config.getFileSizeThreshold();
}
/** /**
* Parse, if necessary, the multipart stream. * Parse, if necessary, the multipart stream.
* *