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 16c1626b236aa2dcbe79496e50fcba0bc3fbd8dc Merge: 45e03ac321 6d4f3c2e3b Author: remm <[email protected]> AuthorDate: Thu Nov 5 19:11:08 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main .../servlet/jsp/el/ImplicitObjectELResolver.java | 11 +- .../apache/catalina/manager/ManagerServlet.java | 8 +- java/org/apache/coyote/http11/Http11Processor.java | 6 +- java/org/apache/el/LocalStrings.properties | 2 + java/org/apache/el/MethodExpressionImpl.java | 8 +- java/org/apache/el/MethodExpressionLiteral.java | 2 +- java/org/apache/el/ValueExpressionImpl.java | 8 +- java/org/apache/el/lang/ELArithmetic.java | 13 +- java/org/apache/el/lang/FunctionMapperImpl.java | 7 +- java/org/apache/el/parser/AstIdentifier.java | 87 ++-- java/org/apache/el/stream/Stream.java | 22 +- java/org/apache/el/util/ExpressionUtils.java | 93 +++++ java/org/apache/jasper/compiler/Parser.java | 3 +- .../apache/jasper/compiler/ParserController.java | 2 +- java/org/apache/jasper/el/JspMethodExpression.java | 4 + java/org/apache/jasper/el/JspValueExpression.java | 4 + .../apache/tomcat/util/net/AbstractEndpoint.java | 33 +- java/org/apache/tomcat/util/net/Constants.java | 18 + .../apache/tomcat/util/net/LocalStrings.properties | 4 + java/org/apache/tomcat/util/net/SSLContext.java | 66 +++ .../apache/tomcat/util/net/SSLContextWrapper.java | 15 + java/org/apache/tomcat/util/net/SSLHostConfig.java | 7 +- .../tomcat/util/net/SSLHostConfigCertificate.java | 37 ++ java/org/apache/tomcat/util/net/SSLUtilBase.java | 136 ++++++- .../tomcat/util/net/jsse/JSSESSLContext.java | 18 + .../util/net/openssl/LocalStrings.properties | 1 + .../tomcat/util/net/openssl/OpenSSLContext.java | 60 +-- .../util/net/openssl/panama/OpenSSLContext.java | 69 +--- .../org/apache/tomcat/websocket/Authenticator.java | 2 +- java/org/apache/tomcat/websocket/Constants.java | 8 + .../tomcat/websocket/LocalStrings.properties | 5 + .../tomcat/websocket/WsWebSocketContainer.java | 71 +++- .../tomcat/websocket/pojo/PojoMethodMapping.java | 12 +- .../tomcat/websocket/server/UpgradeUtil.java | 25 +- .../tomcat/websocket/server/WsServerContainer.java | 2 +- .../jsp/el/TestImplicitObjectELResolver.java | 152 +++++++ .../apache/coyote/http2/TestHttp2Section_3_2.java | 18 + test/org/apache/el/TestMethodExpressionImpl.java | 162 +++++++- test/org/apache/el/TestValueExpressionImpl.java | 43 ++ test/org/apache/el/lang/TestELArithmetic.java | 19 + .../org/apache/el/lang/TestFunctionMapperImpl.java | 104 +++++ test/org/apache/el/parser/TestAstIdentifier.java | 114 ++++++ .../apache/el/stream/TestCollectionOperations.java | 125 ++++++ .../SSLUtilBaseCertificateSelectionTestBase.java | 444 +++++++++++++++++++++ .../tomcat/util/net/TestSSLContextServedAlias.java | 223 +++++++++++ .../tomcat/util/net/TestSSLContextWrapper.java | 156 ++++++++ ...stSSLUtilBaseAutomaticCertificateSelection.java | 148 +++++++ .../TestSSLUtilBaseConfiguredAliasSelection.java | 257 ++++++++++++ .../tomcat/util/net/localhost-rsa-anyauth.jks | Bin 0 -> 2639 bytes .../tomcat/util/net/localhost-rsa-clientauth.jks | Bin 0 -> 2643 bytes .../apache/tomcat/util/net/localhost-rsa-noeku.jks | Bin 0 -> 2757 bytes .../tomcat/util/net/localhost-rsa-serverauth.jks | Bin 0 -> 2644 bytes .../tomcat/util/net/localhost-rsa-serverauth2.jks | Bin 0 -> 2641 bytes .../websocket/TestWsClientHandshakeResponse.java | 215 ++++++++++ .../websocket/server/TestUpgradeHttpVersion.java | 68 ++++ .../server/TestUpgradeSingleValueHeaders.java | 93 +++++ .../websocket/server/TestWsServerContainer.java | 41 +- webapps/docs/changelog.xml | 19 + webapps/docs/config/http.xml | 36 +- webapps/docs/ssl-howto.xml | 123 ++++++ 60 files changed, 3226 insertions(+), 203 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
