This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 2ef17f020f Fix NIO only check new 658b5b61e9 Partial fix for BZ 69135 new be232ad503 Expand BZ 69135 fix - fix relative includes inside JAR file new 2d47ecf17f Complete fixes for BZ 69135 - prevent escape from /META-INF/tags/ The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/jasper/compiler/Parser.java | 10 +++- .../apache/jasper/compiler/ParserController.java | 17 ++++++- .../jasper/resources/LocalStrings.properties | 1 + .../catalina/loader/TestVirtualWebappLoader.java | 4 +- .../apache/jasper/TestJspCompilationContext.java | 54 +++++++++++++++++++++ test/webapp/WEB-INF/lib/bug69135-lib.jar | Bin 0 -> 7366 bytes .../bug6nnnn/bug69135-invalid-jar-escape.jsp} | 8 +-- .../bug6nnnn/bug69135-invalid-jar.jsp} | 8 +-- .../bug6nnnn/bug69135.jsp} | 9 ++-- .../tags/helloWorld.tag => test/webapp/ok.tagf | 5 +- webapps/docs/changelog.xml | 16 ++++++ 11 files changed, 107 insertions(+), 25 deletions(-) create mode 100644 test/webapp/WEB-INF/lib/bug69135-lib.jar copy test/{webapp-2.4/el-as-literal.jsp => webapp/bug6nnnn/bug69135-invalid-jar-escape.jsp} (84%) copy test/{webapp-2.4/el-as-literal.jsp => webapp/bug6nnnn/bug69135-invalid-jar.jsp} (85%) copy test/{webapp-2.4/el-as-literal.jsp => webapp/bug6nnnn/bug69135.jsp} (84%) copy webapps/examples/WEB-INF/tags/helloWorld.tag => test/webapp/ok.tagf (97%) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org