This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 1d43f40 BZ 63982: CombinedRealm makes assumptions about principal implementation new 7f9e8b1 Merge in BCEL changes to ff6941e (2019-12-06, 6.4.2-dev) new cefae34 Merge in Codec changes to 9637dd4 (2019-12-06, 1.14-SNAPSHOT) new be8f0e3 Merge in FileUpload changes to 2317552 (2019-12-06, 2.0-SNAPSHOT) new 2e4536b Fix Findbugs warnings new fea2445 Remove unused code reported by SpotBugs new f4322c6 Fix FileUpload new aa6e0f0 Clean-up. No functional change. new d2a40f2 Clean-up prior to some refactoring. new c31917d Refactor change of session ID to reduce duplicate code new ab72a10 Refactor so Principal is never cached in session with cache==false new be6b473 Harden the FORM authentication process new 11ed237 Align with 8.5.x to aid back-ports new c06674e Add an atomic method to rotate session ID and return new value. new f47bc32 Update changelog The 14 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: java/org/apache/catalina/Manager.java | 43 +- .../catalina/authenticator/AuthenticatorBase.java | 36 +- .../apache/catalina/authenticator/Constants.java | 47 +- .../catalina/authenticator/FormAuthenticator.java | 101 ++- java/org/apache/catalina/connector/Request.java | 33 +- .../catalina/session/LocalStrings.properties | 1 + .../catalina/session/LocalStrings_fr.properties | 1 + .../catalina/session/LocalStrings_ja.properties | 1 + .../catalina/session/LocalStrings_ko.properties | 1 + .../catalina/session/LocalStrings_zh_CN.properties | 1 + java/org/apache/catalina/session/ManagerBase.java | 184 +++--- 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 | 112 +++- .../util/http/fileupload/FileItemIterator.java | 49 +- .../util/http/fileupload/FileUploadBase.java | 708 +-------------------- .../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 | 62 ++ .../fileupload/impl/IOFileUploadException.java | 61 ++ .../impl/InvalidContentTypeException.java | 62 ++ .../util/http/fileupload/impl/SizeException.java | 75 +++ .../impl/SizeLimitExceededException.java} | 37 +- .../org/apache/catalina/session/FileStoreTest.java | 12 +- webapps/docs/changelog.xml | 17 + 33 files changed, 1378 insertions(+), 977 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/{naming/ResourceEnvRef.java => tomcat/util/http/fileupload/impl/SizeLimitExceededException.java} (53%) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org