From 08226e8d090bf3c60d3a14481bd7f68a9754b83f Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 10 Jul 2009 16:26:56 +0000 Subject: [PATCH] Revert r792945 - JSP.7.3.6.1 explicitly states locations without a leading '/' are to be treated as relative to web.xml git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@793019 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/TldConfig.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java index 1cf7b0607..12f153a18 100644 --- a/java/org/apache/catalina/startup/TldConfig.java +++ b/java/org/apache/catalina/startup/TldConfig.java @@ -508,6 +508,11 @@ public final class TldConfig implements LifecycleListener { String taglibs[] = context.findTaglibs(); for (int i = 0; i < taglibs.length; i++) { String resourcePath = context.findTaglib(taglibs[i]); + // FIXME - Servlet 2.4 DTD implies that the location MUST be + // a context-relative path starting with '/'? + if (!resourcePath.startsWith("/")) { + resourcePath = "/WEB-INF/" + resourcePath; + } if (log.isTraceEnabled()) { log.trace(" Adding path '" + resourcePath + "' for URI '" + taglibs[i] + "'"); -- 2.11.0