This is an automated email from the ASF dual-hosted git repository. rmaucher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 50d5ee444a2f8f822947a3a704b88c006f9b1498 Merge: d9a86ce59f a0490668ea Author: remm <[email protected]> AuthorDate: Sat Oct 31 15:56:38 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main .../authenticator/SpnegoAuthenticator.java | 26 - .../apache/catalina/connector/OutputBuffer.java | 2 +- java/org/apache/catalina/connector/Response.java | 12 +- .../group/interceptors/EncryptInterceptor.java | 811 --------------------- .../interceptors/EncryptInterceptorMBean.java | 110 --- .../group/interceptors/LocalStrings.properties | 13 - .../group/interceptors/LocalStrings_cs.properties | 2 - .../group/interceptors/LocalStrings_de.properties | 3 - .../group/interceptors/LocalStrings_es.properties | 2 - .../group/interceptors/LocalStrings_fr.properties | 13 - .../group/interceptors/LocalStrings_ja.properties | 13 - .../group/interceptors/LocalStrings_ko.properties | 8 - .../interceptors/LocalStrings_pt_BR.properties | 2 - .../group/interceptors/LocalStrings_ru.properties | 2 - .../interceptors/LocalStrings_zh_CN.properties | 8 - .../catalina/tribes/transport/ReceiverBase.java | 18 - .../webresources/AbstractArchiveResourceSet.java | 4 +- .../apache/catalina/webresources/JarContents.java | 29 +- .../catalina/webresources/JarResourceRoot.java | 15 +- .../catalina/webresources/JarWarResourceSet.java | 55 +- java/org/apache/coyote/AbstractProtocol.java | 23 +- java/org/apache/coyote/ajp/Constants.java | 7 +- .../apache/coyote/http11/Http11InputBuffer.java | 6 + java/org/apache/coyote/http2/StreamProcessor.java | 7 +- .../tomcat/util/scan/AbstractInputStreamJar.java | 77 +- .../org/apache/tomcat/util/scan/JarFileUrlJar.java | 70 +- .../apache/tomcat/util/scan/MultiReleaseUtil.java | 97 +++ java/org/apache/tomcat/websocket/WsSession.java | 31 +- .../websocket/server/WsHttpUpgradeHandler.java | 7 +- .../interceptors/EncryptInterceptorBaseTest.java | 206 ------ .../group/interceptors/TestEncryptInterceptor.java | 439 ----------- .../TestEncryptInterceptorAlgorithms.java | 163 ----- .../TestEncryptInterceptorLargeHeap.java | 48 -- .../TestMessageDispatchInterceptor.java | 4 +- .../catalina/webresources/TestJarContents.java | 97 ++- .../TestJarResourceSetInternalMount.java | 9 + .../webresources/TestJarWarResourceSet.java | 94 ++- test/org/apache/coyote/ajp/TestConstants.java | 1 - .../util/scan/TestAbstractInputStreamJar.java | 222 ++++++ .../apache/tomcat/util/scan/TestJarFileUrlJar.java | 198 ++++- .../tomcat/util/scan/TestMultiVersionUtil.java | 134 ++++ webapps/docs/changelog.xml | 8 +- webapps/docs/cluster-howto.xml | 4 - webapps/docs/config/cluster.xml | 4 - webapps/docs/security-howto.xml | 5 +- 45 files changed, 993 insertions(+), 2116 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
