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 5a9ed30df8595d1b218be932d69f451712625a3c Merge: 5f4b14f6bc b541a583ec Author: remm <[email protected]> AuthorDate: Wed Oct 28 13:33:34 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main java/jakarta/el/ELProcessor.java | 16 ++++++++-------- java/jakarta/el/ExpressionFactory.java | 8 ++++---- .../catalina/authenticator/AuthenticatorBase.java | 4 ++-- .../catalina/authenticator/SingleSignOn.java | 2 +- java/org/apache/catalina/core/StandardContext.java | 2 +- java/org/apache/catalina/core/StandardHost.java | 4 ++-- java/org/apache/catalina/filters/CorsFilter.java | 4 ++-- .../catalina/filters/CsrfPreventionFilter.java | 8 ++++---- .../org/apache/catalina/filters/ExpiresFilter.java | 4 ++-- .../apache/catalina/filters/RateLimitFilter.java | 2 +- .../catalina/filters/RestCsrfPreventionFilter.java | 2 +- java/org/apache/catalina/ha/backend/TcpSender.java | 2 +- .../catalina/manager/HTMLManagerServlet.java | 2 +- .../org/apache/catalina/realm/DataSourceRealm.java | 4 ++-- java/org/apache/catalina/realm/JNDIRealm.java | 6 +++--- java/org/apache/catalina/realm/MemoryRealm.java | 2 +- java/org/apache/catalina/realm/RealmBase.java | 4 ++-- .../apache/catalina/security/SecurityListener.java | 2 +- java/org/apache/catalina/servlets/CGIServlet.java | 4 ++-- .../apache/catalina/servlets/DefaultServlet.java | 4 ++-- .../apache/catalina/session/DataSourceStore.java | 2 +- .../apache/catalina/ssi/ExpressionTokenizer.java | 2 +- java/org/apache/catalina/ssi/SSIProcessor.java | 2 +- java/org/apache/catalina/startup/Bootstrap.java | 4 ++-- .../catalina/startup/WebappServiceLoader.java | 2 +- .../catalina/storeconfig/XMLFormatPreserver.java | 10 +++++----- .../group/interceptors/EncryptInterceptor.java | 2 +- .../catalina/users/DataSourceUserDatabase.java | 2 +- .../apache/catalina/users/MemoryUserDatabase.java | 12 ++++++------ .../catalina/valves/ParameterLimitValve.java | 6 +++--- .../valves/rewrite/RandomizedTextRewriteMap.java | 4 ++-- .../catalina/valves/rewrite/ResolverImpl.java | 4 ++-- java/org/apache/coyote/CompressionConfig.java | 6 +++--- java/org/apache/jasper/compiler/ELParser.java | 2 +- java/org/apache/jasper/compiler/Generator.java | 4 ++-- .../apache/jasper/compiler/JavacErrorDetail.java | 2 +- java/org/apache/jasper/compiler/Node.java | 18 +++++++++--------- java/org/apache/jasper/compiler/SmapUtil.java | 2 +- java/org/apache/jasper/compiler/Validator.java | 6 +++--- java/org/apache/jasper/tagplugins/jstl/Util.java | 4 ++-- java/org/apache/juli/ClassLoaderLogManager.java | 8 ++++---- java/org/apache/juli/FileHandler.java | 2 +- .../apache/tomcat/buildutil/translate/Import.java | 2 +- .../tomcat/util/buf/EncodedSolidusHandling.java | 2 +- java/org/apache/tomcat/util/buf/StringUtils.java | 2 +- .../tomcat/util/descriptor/tld/TldRuleSet.java | 2 +- .../util/descriptor/web/SecurityConstraint.java | 8 ++++---- .../tomcat/util/descriptor/web/WebRuleSet.java | 4 ++-- .../tomcat/util/digester/CallMethodRule.java | 2 +- .../apache/tomcat/util/digester/CallParamRule.java | 2 +- java/org/apache/tomcat/util/digester/Digester.java | 2 +- .../tomcat/util/http/CookiesWithoutEquals.java | 2 +- java/org/apache/tomcat/util/net/SSLHostConfig.java | 16 ++++++++-------- .../tomcat/util/scan/StandardJarScanFilter.java | 2 +- .../tomcat/util/scan/StandardJarScanner.java | 2 +- .../tomcat/jdbc/naming/TestNamingFactory.java | 2 +- .../interceptor/TestInterceptorResetOrder.java | 2 +- .../tomcat/jdbc/pool/jmx/TestJmxRegistration.java | 2 +- .../org/apache/tomcat/manager2/AppsApiServlet.java | 6 +++--- .../apache/tomcat/manager2/ConfigApiServlet.java | 22 +++++++++++----------- .../apache/tomcat/manager2/HostsApiServlet.java | 2 +- .../apache/tomcat/manager2/StatusApiServlet.java | 2 +- .../org/apache/tomcat/manager2/StatusSnapshot.java | 2 +- .../webbeans/web/tomcat/TomcatSecurityService.java | 2 +- res/checkstyle/test-checkstyle.xml | 1 + .../catalina/core/TestApplicationDispatcher.java | 4 ++-- .../catalina/tribes/demos/CoordinationDemo.java | 6 +++--- .../valves/TestExtendedAccessLogValve.java | 4 ++-- test/org/apache/el/TesterFunctions.java | 2 +- .../jasper/compiler/TestEncodingDetector.java | 2 +- test/org/apache/jasper/compiler/TestJspUtil.java | 2 +- .../apache/juli/TestPerWebappJuliIntegration.java | 4 ++-- test/org/apache/naming/TestEnvEntry.java | 4 ++-- .../util/net/openssl/ciphers/TesterOpenSSL.java | 4 ++-- webapps/docs/changelog.xml | 4 ++++ 75 files changed, 162 insertions(+), 157 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
