This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 98fd719 BZ 63982: CombinedRealm makes assumptions about principal
implementation
new 5d4e832 Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev)
new 99382b7 Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT)
new 218ea93 Merge in FileUpload changes to 2317552 (2019-12-06,
2.0-SNAPSHOT)
new a3fd9ee Merge in Pool 2 changes to 6092f92 (2019-12-06,
2.8.0-SNAPSHOT)
new 1706b31 Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT)
new b9469e8 Fix Findbugs warnings
new b167af1 Remove unused code reported by SpotBugs
new 1a5e42b Fix FileUpload
new b8d9fbc Fix codec
new 17ffce9 Clean-up. No functional change.
new 38ec82c Clean-up prior to some refactoring.
new 0fded7d Refactor change of session ID to reduce duplicate code
new e19a202 Refactor so Principal is never cached in session with
cache==false
new e8ae801 Harden the FORM authentication process
new 6dcf03e Add an atomic method to rotate session ID and return new
value. Use it.
new 98c7c55 Update changelog
new d9a1db7 Fix back-port of atomic session ID rotation. Replace default
method.
new 1f9d3e6 Refactor wait to make test failure due to timing issues less
likely
The 18 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 +-
.../catalina/authenticator/AuthenticatorBase.java | 36 +-
.../apache/catalina/authenticator/Constants.java | 51 +-
.../catalina/authenticator/FormAuthenticator.java | 107 +-
java/org/apache/catalina/connector/Request.java | 34 +-
java/org/apache/catalina/session/ManagerBase.java | 6 +
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 92 +-
.../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 2 +
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 18 +
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 211 ++--
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 134 ++-
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 1270 ++------------------
.../org/apache/tomcat/dbcp/pool2/PooledObject.java | 3 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 2 +
.../tomcat/dbcp/pool2/impl/EvictionConfig.java | 1 +
.../dbcp/pool2/impl/GenericKeyedObjectPool.java | 78 +-
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 46 +-
.../pool2/impl/InterruptibleReentrantLock.java | 1 +
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 4 +
.../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} | 25 +-
.../authenticator/TestBasicAuthParser.java | 15 +-
.../org/apache/catalina/session/FileStoreTest.java | 12 +-
test/org/apache/tomcat/util/net/TestSsl.java | 29 +-
webapps/docs/changelog.xml | 25 +
44 files changed, 1738 insertions(+), 2311 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} (53%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
