Revert r792945 - JSP.7.3.6.1 explicitly states locations without a leading '/' are...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@793019 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 1cf7b06..12f153a 100644 (file)
--- 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] + "'");