This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from a202a68cb3 Revert "Further locking harmonizations for main components"
new 1a2f722e40 Remove unused code - thanks to UCDetector
new 9ba3b0c57f Remove unused code - thanks to UCDetector
new a24dfb9ffc Remove unused code - Thanks to UCDetector
new 46f8078384 Align with Commons File Upload 1.x and make @since tags
project specific
new 29a5b0e37b Update merge info. FileUpload was manually synchronized
with 1.x.
new 264f5abd60 Align with 10.1.x
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MERGE.txt | 8 +-
java/org/apache/catalina/connector/Request.java | 4 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 124 -----------------
.../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 105 --------------
.../dbcp/pool2/KeyedPooledObjectFactory.java | 1 -
.../apache/tomcat/util/codec/binary/Base64.java | 155 ---------------------
.../tomcat/util/codec/binary/BaseNCodec.java | 88 ------------
.../http/fileupload/ByteArrayOutputStream.java | 29 ----
.../tomcat/util/http/fileupload/FileItem.java | 2 +-
.../util/http/fileupload/FileItemHeaders.java | 2 +-
.../http/fileupload/FileItemHeadersSupport.java | 2 +-
.../tomcat/util/http/fileupload/FileUpload.java | 13 --
.../util/http/fileupload/FileUploadBase.java | 53 -------
.../util/http/fileupload/FileUploadException.java | 10 --
.../tomcat/util/http/fileupload/FileUtils.java | 4 +-
.../tomcat/util/http/fileupload/IOUtils.java | 14 +-
.../util/http/fileupload/MultipartStream.java | 3 +-
.../util/http/fileupload/RequestContext.java | 2 +-
.../tomcat/util/http/fileupload/UploadContext.java | 4 +-
.../util/http/fileupload/disk/DiskFileItem.java | 2 +-
.../http/fileupload/disk/DiskFileItemFactory.java | 2 +-
.../util/http/fileupload/disk/package-info.java | 3 +-
.../impl/InvalidContentTypeException.java | 2 +-
.../util/http/fileupload/impl/SizeException.java | 4 +-
.../tomcat/util/http/fileupload/package-info.java | 3 +-
.../http/fileupload/servlet/ServletFileUpload.java | 136 ------------------
.../fileupload/servlet/ServletRequestContext.java | 2 +-
.../http/fileupload/util/FileItemHeadersImpl.java | 2 +-
.../tomcat/util/http/fileupload/util/Streams.java | 35 -----
.../http/fileupload/util/mime/MimeUtility.java | 2 +-
.../http/fileupload/util/mime/ParseException.java | 2 +-
.../util/mime/QuotedPrintableDecoder.java | 2 +-
32 files changed, 37 insertions(+), 783 deletions(-)
delete mode 100644
java/org/apache/tomcat/dbcp/pool2/BaseKeyedPooledObjectFactory.java
delete mode 100644
java/org/apache/tomcat/dbcp/pool2/BasePooledObjectFactory.java
delete mode 100644
java/org/apache/tomcat/util/http/fileupload/servlet/ServletFileUpload.java
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
