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 1fb54640fb5856c7204bab697fea1fb64f7c4fb6 Merge: 2e14185dd3 d44d49338b Author: remm <[email protected]> AuthorDate: Tue Nov 3 00:36:28 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main java/jakarta/el/BeanELResolver.java | 13 + java/jakarta/el/RecordELResolver.java | 93 +++--- java/org/apache/coyote/AbstractProtocol.java | 5 + .../apache/coyote/http11/upgrade/UpgradeInfo.java | 13 +- .../http11/upgrade/UpgradeProcessorBase.java | 6 + .../http11/upgrade/UpgradeProcessorExternal.java | 70 +++-- .../http11/upgrade/UpgradeServletInputStream.java | 27 +- .../http11/upgrade/UpgradeServletOutputStream.java | 8 +- .../coyote/http2/Http2AsyncUpgradeHandler.java | 20 +- .../apache/coyote/http2/Http2UpgradeHandler.java | 127 ++++++-- .../apache/coyote/http2/LocalStrings.properties | 3 +- java/org/apache/el/util/ConcurrentCache.java | 18 +- java/org/apache/tomcat/util/buf/Asn1Writer.java | 45 ++- .../tomcat/util/collections/ConcurrentCache.java | 23 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 4 + .../el/TestBeanELResolverConcurrentCache.java | 143 +++++++++ test/jakarta/el/TestRecordELResolver.java | 17 + test/jakarta/el/TesterBeanC.java | 22 ++ test/jakarta/el/TesterBeanCImpl.java | 25 ++ .../apache/coyote/http11/upgrade/TestUpgrade.java | 184 +++++++++++ .../coyote/http2/TestHttp2AsyncUpgradeHandler.java | 19 +- .../coyote/http2/TestHttp2UpgradeHandler.java | 350 +++++++++++++++++++++ test/org/apache/coyote/http2/TestRfc9218.java | 134 +++++--- .../util}/TestConcurrentCache.java | 64 +++- .../org/apache/tomcat/util/buf/TestAsn1Writer.java | 76 +++++ .../util/collections/TestConcurrentCache.java | 62 +++- webapps/docs/changelog.xml | 25 +- 27 files changed, 1367 insertions(+), 229 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
