Author: markt
Date: Fri May 13 16:52:46 2016
New Revision: 1743700
URL: http://svn.apache.org/viewvc?rev=1743700&view=rev
Log:
Update internal fork of Commons File Upload
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/webapps/docs/changelog.xml
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 16:52:46 2016
@@ -1 +1 @@
-/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1725744
+/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:1-1743698
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1743700&r1=1743699&r2=1743700&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Fri May 13 16:52:46 2016
@@ -288,12 +288,6 @@ public class MultipartStream {
if (boundary == null) {
throw new IllegalArgumentException("boundary may not be null");
}
-
- this.input = input;
- this.bufSize = bufSize;
- this.buffer = new byte[bufSize];
- this.notifier = pNotifier;
-
// We prepend CR/LF to the boundary to chop trailing CR/LF from
// body-data tokens.
this.boundaryLength = boundary.length + BOUNDARY_PREFIX.length;
@@ -301,6 +295,12 @@ public class MultipartStream {
throw new IllegalArgumentException(
"The buffer size specified for the MultipartStream is too
small");
}
+
+ this.input = input;
+ this.bufSize = Math.max(bufSize, boundaryLength*2);
+ this.buffer = new byte[this.bufSize];
+ this.notifier = pNotifier;
+
this.boundary = new byte[this.boundaryLength];
this.keepRegion = this.boundary.length;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1743700&r1=1743699&r2=1743700&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May 13 16:52:46 2016
@@ -68,6 +68,10 @@
Update the internal fork of Commons Pool 2 to r1743697 (2.4.2 plus
additional fixes). (markt)
</update>
+ <update>
+ Update the internal fork of Commons File Upload to r1743698 (1.3.1 plus
+ additional fixes). (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
