This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 23080db Update Commons FileUpload
23080db is described below
commit 23080dbd9ce1d74d0da99cf4c22dbd50e2d65f0c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Aug 1 21:10:25 2019 +0100
Update Commons FileUpload
---
java/org/apache/tomcat/util/http/fileupload/FileItem.java | 4 ++--
java/org/apache/tomcat/util/http/fileupload/FileItemStream.java | 4 ++--
.../org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java | 8 ++++----
.../org/apache/tomcat/util/http/fileupload/disk/package-info.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/package-info.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
index c024aa5..b69a51e 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItem.java
@@ -69,12 +69,12 @@ public interface FileItem extends FileItemHeadersSupport {
String getContentType();
/**
- * Returns the original filename in the client's filesystem, as provided by
+ * Returns the original file name in the client's file system, as provided
by
* the browser (or other client software). In most cases, this will be the
* base file name, without path information. However, some clients, such as
* the Opera browser, do include path information.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's file system.
* @throws InvalidFileNameException The file name contains a NUL character,
* which might be an indicator of a security attack. If you intend to
* use the file name anyways, catch the exception and use
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileItemStream.java
b/java/org/apache/tomcat/util/http/fileupload/FileItemStream.java
index bb6949c..2df072b 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileItemStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileItemStream.java
@@ -73,12 +73,12 @@ public interface FileItemStream extends
FileItemHeadersSupport {
String getContentType();
/**
- * Returns the original filename in the client's filesystem, as provided by
+ * Returns the original file name in the client's file system, as provided
by
* the browser (or other client software). In most cases, this will be the
* base file name, without path information. However, some clients, such as
* the Opera browser, do include path information.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's file system.
*/
String getName();
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
index 3992162..b94a960 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
@@ -99,7 +99,7 @@ public class DiskFileItem
private boolean isFormField;
/**
- * The original filename in the user's filesystem.
+ * The original file name in the user's file system.
*/
private final String fileName;
@@ -156,7 +156,7 @@ public class DiskFileItem
* <code>null</code> if not specified.
* @param isFormField Whether or not this item is a plain form field, as
* opposed to a file upload.
- * @param fileName The original filename in the user's filesystem, or
+ * @param fileName The original file name in the user's file system,
or
* <code>null</code> if not specified.
* @param sizeThreshold The threshold, in bytes, below which items will be
* retained in memory and above which they will be
@@ -228,9 +228,9 @@ public class DiskFileItem
}
/**
- * Returns the original filename in the client's filesystem.
+ * Returns the original file name in the client's file system.
*
- * @return The original filename in the client's filesystem.
+ * @return The original file name in the client's file system.
* @throws org.apache.tomcat.util.http.fileupload.InvalidFileNameException
* The file name contains a NUL character, which might be an indicator of
* a security attack. If you intend to use the file name anyways, catch
diff --git a/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
index 25c7f0b..6e9599a 100644
--- a/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/disk/package-info.java
@@ -45,7 +45,7 @@
* </pre>
* <p>
* Please see the FileUpload
- * <a href="http://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
+ * <a href="https://commons.apache.org/fileupload/using.html";
target="_top">User Guide</a>
* for further details and examples of how to use this package.
* </p>
*/
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index 6e232ba..af24f38 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -60,9 +60,9 @@
* Iterator i = fileItems.iterator();
* String comment = ((FileItem)i.next()).getString();
* FileItem fi = (FileItem)i.next();
- * // filename on the client
+ * // file name on the client
* String fileName = fi.getName();
- * // save comment and filename to database
+ * // save comment and file name to database
* ...
* // write the file
* fi.write(new File("/www/uploads/", fileName));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
