Author: markt
Date: Wed Mar 27 21:14:11 2013
New Revision: 1461852
URL: http://svn.apache.org/r1461852
Log:
Update to FileUpload 1.3
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1461849
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
------------------------------------------------------------------------------
Merged
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload:r1458580,1458597,1458928,1458936,1459121,1459183-1459184,1459188,1459901,1460343
Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1461849
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java?rev=1461852&r1=1461851&r2=1461852&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
Wed Mar 27 21:14:11 2013
@@ -112,7 +112,7 @@ public class DiskFileItem
* The content type passed by the browser, or <code>null</code> if
* not defined.
*/
- private String contentType;
+ private final String contentType;
/**
* Whether or not this item is a simple form field.
@@ -122,7 +122,7 @@ public class DiskFileItem
/**
* The original filename in the user's filesystem.
*/
- private String fileName;
+ private final String fileName;
/**
* The size of the item, in bytes. This is used to cache the size when a
@@ -134,12 +134,12 @@ public class DiskFileItem
/**
* The threshold above which uploads will be stored on disk.
*/
- private int sizeThreshold;
+ private final int sizeThreshold;
/**
* The directory in which uploaded files will be stored, if stored on disk.
*/
- private File repository;
+ private final File repository;
/**
* Cached contents of the file.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java?rev=1461852&r1=1461851&r2=1461852&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package-info.java
Wed Mar 27 21:14:11 2013
@@ -18,7 +18,7 @@
/**
* <p><b>NOTE:</b> This code has been copied from commons-fileupload trunk
- * revision 1458500 and commons-io 1.4 and package renamed to avoid clashes
with
+ * 1.3 and commons-io 1.4 and package renamed to avoid clashes with
* any web apps that may wish to use these libraries.
* </p>
* <p>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1461852&r1=1461851&r2=1461852&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 27 21:14:11 2013
@@ -56,6 +56,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.40 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <update>
+ Update Tomcat's internal copy of Commons FileUpload to FileUpload 1.3.
+ (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="jdbc-pool">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
