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 2f713bf41bf97552abe95377d9ec1099c1d3466a Merge: 8af5babcc5 3260be4edf Author: remm <[email protected]> AuthorDate: Wed Nov 4 16:51:10 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main TODO.md | 3 +- build.xml | 29 +- .../apache/catalina/connector/CoyoteAdapter.java | 7 +- .../catalina/connector/LocalStrings.properties | 1 - .../org/apache/catalina/core/AsyncContextImpl.java | 29 +- java/org/apache/catalina/servlets/CGIServlet.java | 14 +- .../apache/catalina/util/LocalStrings.properties | 2 + java/org/apache/catalina/util/RequestUtil.java | 132 ++++++++ java/org/apache/jasper/compiler/JspUtil.java | 17 +- .../util/collections/CaseInsensitiveKeyMap.java | 20 +- .../org/apache/tomcat/util/http/parser/Ranges.java | 13 + java/org/apache/tomcat/util/json/JSONParser.java | 12 +- java/org/apache/tomcat/util/json/JSONParser.jjt | 8 +- .../util/modeler/BaseNotificationBroadcaster.java | 102 ++++-- .../tomcat/util/modeler/LocalStrings.properties | 4 +- .../tomcat/util/modeler/LocalStrings_fr.properties | 1 - .../tomcat/util/modeler/LocalStrings_ja.properties | 1 - .../tomcat/util/modeler/LocalStrings_ko.properties | 1 - .../util/modeler/LocalStrings_zh_CN.properties | 1 - .../tomcat/util/modeler/NoDescriptorRegistry.java | 6 +- java/org/apache/tomcat/util/modeler/Registry.java | 92 ++++-- .../modeler/modules/LocalStrings_fr.properties | 1 + .../modeler/modules/LocalStrings_ja.properties | 1 + ...gs_fr.properties => LocalStrings_ko.properties} | 2 +- ...fr.properties => LocalStrings_zh_CN.properties} | 2 +- .../modules/MbeansDescriptorsDigesterSource.java | 4 +- .../tomcat/util/modeler/modules/ModelerSource.java | 3 +- java/org/apache/tomcat/util/net/IPv6Utils.java | 20 +- .../apache/tomcat/util/net/LocalStrings.properties | 2 + java/org/apache/tomcat/util/net/SSLHostConfig.java | 25 +- .../tomcat/util/net/SSLHostConfigCertificate.java | 6 +- java/org/apache/tomcat/util/net/SSLUtilBase.java | 19 +- java/org/apache/tomcat/util/net/jsse/PEMFile.java | 18 +- .../util/net/openssl/LocalStrings.properties | 1 + .../tomcat/util/net/openssl/OpenSSLContext.java | 57 +++- .../tomcat/util/net/openssl/OpenSSLEngine.java | 13 +- .../tomcat/util/net/openssl/OpenSSLStatus.java | 4 +- .../ciphers/OpenSSLCipherConfigurationParser.java | 8 + .../util/net/openssl/panama/CertificateLoader.java | 169 +++++++--- .../net/openssl/panama/LocalStrings.properties | 4 + .../util/net/openssl/panama/OpenSSLContext.java | 8 +- .../util/net/openssl/panama/OpenSSLEngine.java | 39 ++- .../util/net/openssl/panama/OpenSSLLibrary.java | 66 ++-- java/org/apache/tomcat/util/openssl/openssl_h.java | 83 ++++- .../tomcat/util/scan/ReferenceCountedJar.java | 5 + res/openssl/openssl-tomcat.conf | 3 +- .../apache/catalina/core/TestAsyncContextImpl.java | 71 ++++ .../servlets/TestCGIServletMethodNotAllowed.java | 148 +++++++++ .../tribes/group/TestGroupChannelTlsFFM.java | 1 - .../coyote/http11/TestHttp11InputBuffer.java | 2 +- .../apache/coyote/http2/TestHttp2Section_4_1.java | 20 +- .../jasper/compiler/TestJspUtilGetReader.java | 88 +++++ .../collections/TestCaseInsensitiveKeyMap.java | 25 ++ .../apache/tomcat/util/http/parser/TestRanges.java | 24 ++ .../apache/tomcat/util/json/TestJSONParser.java | 48 +++ .../modeler/TestBaseModelMBeanNotifications.java | 211 ++++++++++++ .../util/modeler/TestNoDescriptorRegistry.java | 14 + .../apache/tomcat/util/modeler/TestRegistry.java | 139 ++++++++ .../util/modeler/TestRegistryConvertValue.java | 24 +- .../TestMbeansDescriptorsDigesterSource.java | 87 +++++ .../apache/tomcat/util/net/TestSSLHostConfig.java | 21 +- .../tomcat/util/net/TestSSLHostConfigCompat.java | 363 +++++++++++++++++++++ test/org/apache/tomcat/util/net/TesterSupport.java | 125 +++++++ .../apache/tomcat/util/net/jsse/TestPEMFile.java | 64 +++- .../tomcat/util/net/openssl/TestOpenSSLStatus.java | 81 +++++ .../TestOpenSSLCipherConfigurationParser.java | 95 ++++++ .../net/openssl/panama/TestCertificateLoader.java | 139 ++++++++ webapps/docs/changelog.xml | 42 +++ webapps/docs/config/http.xml | 14 + webapps/docs/ssl-howto.xml | 6 + 70 files changed, 2599 insertions(+), 311 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
