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 1c50974ca47b30ee7d1eb067ef28065f934a448e Merge: 023cdabc58 03073e1612 Author: remm <[email protected]> AuthorDate: Fri Nov 6 11:36:30 2026 +0100 Merge branch 'main' of [email protected]:apache/tomcat.git into main build.properties.default | 16 ++--- java/org/apache/jasper/el/JasperELResolver.java | 5 +- java/org/apache/jasper/el/JspELException.java | 2 +- .../jasper/el/JspMethodNotFoundException.java | 2 +- .../jasper/el/JspPropertyNotFoundException.java | 2 +- .../jasper/el/JspPropertyNotWritableException.java | 2 +- java/org/apache/jasper/runtime/JspFactoryImpl.java | 8 ++- .../org/apache/jasper/runtime/PageContextImpl.java | 19 +----- .../apache/jasper/servlet/JspCServletContext.java | 6 +- .../apache/jasper/servlet/JspServletWrapper.java | 6 +- java/org/apache/jasper/servlet/TldScanner.java | 33 +++++----- java/org/apache/jasper/tagplugins/jstl/Util.java | 4 +- .../apache/jasper/tagplugins/jstl/core/Import.java | 8 ++- .../org/apache/jasper/el/TestJasperELResolver.java | 30 ++++++++++ .../jasper/servlet/TestJspCServletContext.java | 48 +++++++++++++++ test/org/apache/jasper/servlet/TestTldScanner.java | 70 ++++++++++++++++++++++ webapps/docs/changelog.xml | 12 ++++ 17 files changed, 220 insertions(+), 53 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
