Author: markt
Date: Mon Sep 9 11:56:53 2013
New Revision: 1521060
URL: http://svn.apache.org/r1521060
Log:
Sync fileupload with latest version from Commons
- one minor API change to make a package private constructor public
Modified:
tomcat/trunk/SVN-MERGE.txt
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ (props changed)
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1521060&r1=1521059&r2=1521060&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Mon Sep 9 11:56:53 2013
@@ -42,9 +42,6 @@ org.apache.tomcat.util.http.fileupload i
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload
Note: Tomcat's copy of fileupload also includes classes copied manually (rather
than svn copied) from Commons IO.
-Note: There is a Javadoc comment at the top of the following file that mentions
- what svn revision of Commons FileUpload trunk was used by Tomcat:
- org/apache/tomcat/util/http/fileupload/package-info.java
Codec
org.apache.tomcat.util.codec is copied from:
Propchange: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1513134
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=1521060&r1=1521059&r2=1521060&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
Mon Sep 9 11:56:53 2013
@@ -281,7 +281,7 @@ public class MultipartStream {
* @see #MultipartStream(InputStream, byte[],
* MultipartStream.ProgressNotifier)
*/
- MultipartStream(InputStream input,
+ public MultipartStream(InputStream input,
byte[] boundary,
int bufSize,
ProgressNotifier pNotifier) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
