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 6ba25c848c84f4b076220c5e0578a1cbb9063ed0 Merge: 0f9309c23c 2231557217 Author: remm <[email protected]> AuthorDate: Tue Oct 20 23:05:50 2026 +0200 Merge branch 'main' of [email protected]:apache/tomcat.git into main bin/tool-wrapper.sh | 10 +- build.properties.default | 8 + build.xml | 9 + .../apache/catalina/tribes/ChannelReceiver.java | 24 ++ .../catalina/tribes/group/ChannelCoordinator.java | 8 +- .../catalina/tribes/transport/ReceiverBase.java | 27 +- .../catalina/tribes/transport/nio/NioReceiver.java | 41 ++- .../tribes/transport/nio/NioReceiverMBean.java | 24 ++ .../coyote/http11/upgrade/LocalStrings.properties | 1 + .../http11/upgrade/UpgradeProcessorExternal.java | 26 ++ .../http11/upgrade/UpgradeServletInputStream.java | 2 +- .../http11/upgrade/UpgradeServletOutputStream.java | 2 +- java/org/apache/el/lang/ELArithmetic.java | 24 +- .../tomcat/util/collections/SynchronizedQueue.java | 10 +- .../util/net/openssl/panama/CertificateLoader.java | 3 +- .../util/net/openssl/panama/OpenSSLEngine.java | 9 +- java/org/apache/tomcat/util/openssl/openssl_h.java | 51 ++++ res/openssl/openssl-tomcat.conf | 1 + test/jakarta/el/TestBeanELResolver.java | 19 +- .../authenticator/TestFormAuthenticatorA.java | 1 + .../authenticator/TestFormAuthenticatorB.java | 1 + .../authenticator/TestFormAuthenticatorC.java | 1 + .../apache/catalina/core/TestAsyncContextImpl.java | 59 ++-- .../TestRateLimitFilterWithExactRateLimiter.java | 11 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 188 +++++++++++-- .../session/TestStandardSessionIntegration.java | 7 +- test/org/apache/catalina/ssi/TestSSIFsize.java | 3 +- .../TesterServiceWithFailingInitializer.java | 2 +- .../group/interceptors/TestSimpleCoordinator.java | 7 +- .../tribes/membership/TestMcastService.java | 38 ++- .../tribes/tipis/TestAbstractReplicatedMap.java | 97 +++---- .../tribes/tipis/TestLazyReplicatedMap.java | 15 +- .../tribes/transport/TestAbstractSender.java | 23 +- .../tribes/transport/nio/TestNioReceiver.java | 114 ++++++++ .../rewrite/TestRandomizedTextRewriteMap.java | 30 +- test/org/apache/coyote/ajp/AjpBaseTest.java | 56 ++++ .../coyote/ajp/TestAbstractAjpProcessor.java | 34 +-- test/org/apache/coyote/ajp/TestAjpSecurity.java | 158 +++++++++++ .../http11/filters/TestBufferedInputFilter.java | 2 +- .../apache/coyote/http11/upgrade/TestUpgrade.java | 45 ++- ...tion_8_2.java => Http2Section_8_2BaseTest.java} | 13 +- .../coyote/http2/TestHttp2Section_8_2_00To3F.java | 29 ++ .../coyote/http2/TestHttp2Section_8_2_40To7F.java | 29 ++ .../coyote/http2/TestHttp2Section_8_2_80ToBF.java | 29 ++ .../coyote/http2/TestHttp2Section_8_2_C0ToFF.java | 29 ++ test/org/apache/el/TestMethodExpressionImpl.java | 3 +- test/org/apache/el/TesterFunctions.java | 2 +- test/org/apache/el/lang/TestELArithmetic.java | 33 +-- test/org/apache/el/lang/TestELSupport.java | 6 +- test/org/apache/el/parser/TestAstIdentifier.java | 9 +- .../apache/el/stream/TestCollectionOperations.java | 36 +-- .../apache/jasper/compiler/TestJavaCompiler.java | 2 +- .../apache/jasper/util/TestFastRemovalDequeue.java | 20 +- ...ity2018.java => TestSecurity2018WebSocket.java} | 2 +- .../tomcat/security/TestSecurity2026Http2.java | 311 +++++++++++++++++++++ .../apache/tomcat/util/TestIntrospectionUtils.java | 1 + .../collections/TestCaseInsensitiveKeyMap.java | 1 + .../util/collections/TestSynchronizedQueue.java | 6 +- .../util/descriptor/tld/TestTldResourcePath.java | 9 +- .../modeler/TestBaseModelMBeanNotifications.java | 2 +- .../apache/tomcat/util/net/jsse/TestPEMFile.java | 43 +-- .../apache/tomcat/util/scan/TestJarFileUrlJar.java | 2 +- .../tomcat/util/scan/TestJarFileUrlNestedJar.java | 33 +-- .../util/threads/TestInlineExecutorService.java | 170 +++++------ .../apache/tomcat/util/threads/TestTaskQueue.java | 39 ++- .../util/threads/TestThreadPoolExecutor.java | 18 +- .../websocket/pojo/TestPojoMethodMapping.java | 28 +- .../websocket/server/TestWsServerContainer.java | 3 +- webapps/docs/changelog.xml | 17 ++ webapps/docs/config/cluster-receiver.xml | 16 +- 70 files changed, 1628 insertions(+), 504 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
