This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from dff6e16 Fix missing loose-ends when re-packaging SSI into a separate library. new 07f80e3 Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev) new 98ef428 Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT) new ee7666a Merge in FileUpload changes to 2317552 (2019-12-06, 2.0-SNAPSHOT) new 6ad6bfc Merge in Pool 2 changes to 6092f92 (2019-12-06, 2.8.0-SNAPSHOT) new a5e3a52 Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT) new 5cad86d Fix Findbugs warnings new 86dcf49 Remove unused code reported by SpotBugs new 77401cb Fix FileUpload new 0499c74 Fix codec The 9 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 | 20 +- java/org/apache/catalina/connector/Request.java | 6 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 92 +-- .../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 2 + .../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 + .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 227 ++++--- java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 138 ++-- java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 26 +- .../org/apache/tomcat/dbcp/pool2/PooledObject.java | 3 +- .../dbcp/pool2/impl/DefaultEvictionPolicy.java | 2 + .../tomcat/dbcp/pool2/impl/EvictionConfig.java | 1 + .../tomcat/dbcp/pool2/impl/EvictionTimer.java | 9 +- .../dbcp/pool2/impl/GenericKeyedObjectPool.java | 25 +- .../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 29 +- .../pool2/impl/InterruptibleReentrantLock.java | 1 + .../dbcp/pool2/impl/LinkedBlockingDeque.java | 4 + .../dbcp/pool2/impl/SecurityManagerCallStack.java | 7 +- .../dbcp/pool2/impl/SoftReferenceObjectPool.java | 3 + java/org/apache/tomcat/util/bcel/Const.java | 14 +- .../tomcat/util/bcel/classfile/ConstantClass.java | 2 +- .../tomcat/util/bcel/classfile/ConstantDouble.java | 2 +- .../tomcat/util/bcel/classfile/ConstantFloat.java | 2 +- .../util/bcel/classfile/ConstantInteger.java | 2 +- .../tomcat/util/bcel/classfile/ConstantLong.java | 2 +- .../apache/tomcat/util/codec/binary/Base64.java | 28 +- .../tomcat/util/codec/binary/BaseNCodec.java | 100 ++- .../util/http/fileupload/FileItemIterator.java | 49 +- .../util/http/fileupload/FileUploadBase.java | 702 +-------------------- .../util/http/fileupload/MultipartStream.java | 10 +- .../util/http/fileupload/disk/DiskFileItem.java | 3 +- .../http/fileupload/impl/FileItemIteratorImpl.java | 339 ++++++++++ .../http/fileupload/impl/FileItemStreamImpl.java | 213 +++++++ .../impl/FileSizeLimitExceededException.java | 94 +++ .../fileupload/impl/FileUploadIOException.java | 63 ++ .../fileupload/impl/IOFileUploadException.java | 62 ++ .../impl/InvalidContentTypeException.java | 62 ++ .../util/http/fileupload/impl/SizeException.java | 75 +++ .../SizeLimitExceededException.java} | 81 +-- .../authenticator/TestBasicAuthParser.java | 15 +- .../org/apache/catalina/session/FileStoreTest.java | 12 +- webapps/docs/changelog.xml | 20 + 41 files changed, 1508 insertions(+), 1040 deletions(-) create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/FileItemStreamImpl.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/FileSizeLimitExceededException.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/FileUploadIOException.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/IOFileUploadException.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/InvalidContentTypeException.java create mode 100644 java/org/apache/tomcat/util/http/fileupload/impl/SizeException.java copy java/org/apache/tomcat/util/http/fileupload/{util/mime/ParseException.java => impl/SizeLimitExceededException.java} (51%) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org