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 fb6f0a2b93c86e15329b07d2452e5ddabe535f24 Merge: 7f35d5292e 8d8369c7e3 Author: remm <[email protected]> AuthorDate: Mon Oct 19 23:16:29 2026 +0200 Merge branch 'main' of [email protected]:apache/tomcat.git into main TODO.md | 5 +- build.xml | 12 +++- java/org/apache/catalina/core/StandardContext.java | 16 +++-- java/org/apache/catalina/core/StandardServer.java | 5 +- .../apache/catalina/ssi/ExpressionParseTree.java | 23 +++--- .../apache/catalina/ssi/LocalStrings.properties | 1 + java/org/apache/catalina/ssi/SSIServlet.java | 12 +--- java/org/apache/catalina/ssi/SSISet.java | 32 ++++----- .../org/apache/catalina/startup/ContextConfig.java | 11 +-- .../catalina/startup/WebappServiceLoader.java | 4 +- java/org/apache/catalina/util/ContextName.java | 26 ++++--- .../catalina/ssi/TestExpressionParseTree.java | 26 ++++--- test/org/apache/catalina/ssi/TestSSISet.java | 81 ++++++++++++++++++---- test/org/apache/catalina/ssi/TestSsiServlet.java | 42 ----------- webapps/docs/changelog.xml | 11 +++ webapps/docs/config/http.xml | 11 +-- 16 files changed, 188 insertions(+), 130 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
