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 94bd7704e5e7361033fe6a93030843914e579805 Merge: 1c33320082 0d122198a7 Author: remm <[email protected]> AuthorDate: Fri Nov 6 18:04:12 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main .../catalina/authenticator/AuthenticatorBase.java | 8 +- .../authenticator/LocalStrings_fr.properties | 1 + .../authenticator/LocalStrings_ja.properties | 1 + .../catalina/connector/LocalStrings_fr.properties | 1 - .../catalina/connector/LocalStrings_ja.properties | 1 - .../catalina/connector/LocalStrings_ko.properties | 1 - .../connector/LocalStrings_zh_CN.properties | 1 - java/org/apache/catalina/connector/Request.java | 27 ++- .../apache/catalina/connector/RequestFacade.java | 13 ++ .../catalina/core/ApplicationDispatcher.java | 2 +- .../catalina/core/ApplicationHttpRequest.java | 83 ++++++++- .../catalina/core/LocalStrings_fr.properties | 4 + .../catalina/core/LocalStrings_ja.properties | 4 + .../org/apache/catalina/filters/ExpiresFilter.java | 29 ++- .../catalina/filters/LocalStrings_cs.properties | 2 +- .../catalina/filters/LocalStrings_de.properties | 2 +- .../catalina/filters/LocalStrings_es.properties | 2 +- .../catalina/filters/LocalStrings_ko.properties | 2 +- .../catalina/filters/LocalStrings_pt_BR.properties | 2 +- .../catalina/filters/LocalStrings_ru.properties | 2 +- .../catalina/filters/LocalStrings_zh_CN.properties | 2 +- .../catalina/ha/backend/LocalStrings_fr.properties | 2 + .../catalina/ha/backend/LocalStrings_ja.properties | 2 + .../catalina/ha/deploy/LocalStrings_fr.properties | 2 + .../catalina/ha/deploy/LocalStrings_ja.properties | 2 + .../catalina/manager/LocalStrings_ja.properties | 2 +- java/org/apache/catalina/mapper/Mapper.java | 49 ++++-- java/org/apache/catalina/mapper/MappingData.java | 6 + .../catalina/realm/LocalStrings_cs.properties | 1 - .../catalina/realm/LocalStrings_es.properties | 6 + .../catalina/realm/LocalStrings_fr.properties | 4 + .../catalina/realm/LocalStrings_ja.properties | 4 + .../catalina/realm/LocalStrings_pt_BR.properties | 2 + java/org/apache/catalina/realm/LockOutRealm.java | 86 ++++++++- java/org/apache/catalina/servlets/CGIServlet.java | 19 +- .../catalina/servlets/LocalStrings.properties | 1 + .../catalina/startup/LocalStrings_ja.properties | 4 +- .../storeconfig/LocalStrings_fr.properties | 6 +- .../storeconfig/LocalStrings_ja.properties | 6 +- .../tribes/group/LocalStrings_fr.properties | 5 + .../tribes/group/LocalStrings_ja.properties | 5 + .../tribes/membership/LocalStrings_fr.properties | 1 + .../tribes/membership/LocalStrings_ja.properties | 1 + .../transport/nio/LocalStrings_fr.properties | 8 + .../transport/nio/LocalStrings_ja.properties | 8 + .../catalina/util/LocalStrings_fr.properties | 2 + .../catalina/util/LocalStrings_ja.properties | 2 + .../catalina/util/LocalStrings_ko.properties | 2 + .../catalina/util/LocalStrings_zh_CN.properties | 2 + .../catalina/valves/LoadBalancerDrainingValve.java | 3 +- .../catalina/valves/rewrite/RewriteValve.java | 2 +- java/org/apache/coyote/LocalStrings_fr.properties | 2 + java/org/apache/coyote/LocalStrings_ja.properties | 2 + .../coyote/http11/LocalStrings_fr.properties | 1 + .../coyote/http11/LocalStrings_ja.properties | 1 + .../coyote/http2/ConnectionSettingsBase.java | 18 +- java/org/apache/coyote/http2/Http2AsyncParser.java | 8 + java/org/apache/coyote/http2/Http2Parser.java | 23 ++- java/org/apache/coyote/http2/Http2Protocol.java | 16 +- .../apache/coyote/http2/LocalStrings.properties | 1 - .../apache/coyote/http2/LocalStrings_cs.properties | 1 - .../apache/coyote/http2/LocalStrings_de.properties | 1 - .../apache/coyote/http2/LocalStrings_es.properties | 1 - .../apache/coyote/http2/LocalStrings_fr.properties | 1 - .../apache/coyote/http2/LocalStrings_ja.properties | 1 - .../apache/coyote/http2/LocalStrings_ko.properties | 1 - .../coyote/http2/LocalStrings_zh_CN.properties | 1 - java/org/apache/el/LocalStrings_ko.properties | 1 - java/org/apache/el/LocalStrings_zh_CN.properties | 1 - .../apache/jasper/compiler/TagPluginManager.java | 23 +++ .../compiler/tagplugin/TagPluginContext.java | 28 +++ .../jasper/tagplugins/jstl/core/ForEach.java | 26 +-- .../jasper/tagplugins/jstl/core/ForTokens.java | 9 +- .../apache/jasper/tagplugins/jstl/core/Import.java | 22 +-- .../tagplugins/jstl/core/LoopAttributeChecks.java | 68 ++++++++ .../apache/jasper/tagplugins/jstl/core/Out.java | 5 + .../apache/jasper/tagplugins/jstl/core/Param.java | 87 +++++---- .../jasper/tagplugins/jstl/core/Redirect.java | 9 +- .../apache/jasper/tagplugins/jstl/core/Url.java | 9 +- .../jasper/tagplugins/jstl/core/UrlParameters.java | 124 +++++++++++++ .../apache/jasper/util/UniqueAttributesImpl.java | 10 ++ java/org/apache/juli/FileHandler.java | 16 +- java/org/apache/juli/logging/LogFactory.java | 65 ++++++- java/org/apache/naming/NamingContext.java | 50 +++--- .../modeler/modules/LocalStrings_fr.properties | 1 + .../modeler/modules/LocalStrings_ja.properties | 1 + .../apache/tomcat/util/net/LocalStrings.properties | 1 + .../tomcat/util/net/TLSClientHelloExtractor.java | 6 +- .../util/net/jsse/LocalStrings_fr.properties | 1 + .../util/net/jsse/LocalStrings_ja.properties | 1 + .../util/net/openssl/LocalStrings_fr.properties | 3 + .../util/net/openssl/LocalStrings_ja.properties | 3 + .../net/openssl/panama/LocalStrings_fr.properties | 4 +- .../net/openssl/panama/LocalStrings_ja.properties | 4 +- .../openssl/panama/LocalStrings_zh_CN.properties | 2 - .../tomcat/websocket/LocalStrings.properties | 3 + .../tomcat/websocket/WsRemoteEndpointImplBase.java | 58 ++++-- java/org/apache/tomcat/websocket/WsSession.java | 100 ++++++++++- .../tomcat/websocket/WsWebSocketContainer.java | 29 ++- .../tomcat/websocket/pojo/PojoEndpointBase.java | 6 +- .../websocket/server/LocalStrings.properties | 2 + .../websocket/server/WsHttpUpgradeHandler.java | 40 ++++- .../web/tomcat/OpenWebBeansInstanceManager.java | 2 +- .../catalina/core/TestApplicationHttpRequest.java | 2 +- .../TesterApplicationHttpRequestPerformance.java | 4 +- .../apache/coyote/http2/TestHttp2Section_3_2.java | 27 +++ .../apache/coyote/http2/TestHttp2Section_4_3.java | 2 +- .../apache/coyote/http2/TestHttp2Section_5_5.java | 2 +- .../apache/coyote/http2/TestHttp2Section_6_2.java | 64 +++++++ .../apache/coyote/http2/TestHttp2Section_6_3.java | 2 +- .../apache/coyote/http2/TestHttp2Section_6_5.java | 29 +++ .../jasper/tagplugins/jstl/core/TestForEach.java | 16 ++ .../jasper/tagplugins/jstl/core/TestImport.java | 2 +- .../jasper/tagplugins/jstl/core/TestRedirect.java | 2 +- .../jasper/tagplugins/jstl/core/TestUrl.java | 22 ++- .../jasper/util/TestUniqueAttributesImpl.java | 41 +++++ test/org/apache/juli/logging/TestLogFactory.java | 194 +++++++++++++++++++-- .../logging/provider/TesterLogFactoryProvider.java | 44 +++++ .../naming/TestNamingContextConcurrency.java | 45 +++++ test/webapp/jstl/foreach-begin-after-end.jsp | 40 +++++ test/webapp/jstl/url-param-fallback-nested.jsp | 20 +++ webapps/docs/changelog.xml | 49 +++++- webapps/docs/config/realm.xml | 14 ++ 123 files changed, 1659 insertions(+), 296 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
