Author: markt
Date: Mon Jun 6 13:23:45 2016
New Revision: 1746989
URL: http://svn.apache.org/viewvc?rev=1746989&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59654
Improve error message when attempting to use a TLD file from an invalid
location.
Patch provided by Huxing Zhang.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1746989&r1=1746988&r2=1746989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Mon
Jun 6 13:23:45 2016
@@ -276,9 +276,11 @@ class TagLibraryInfoImpl extends TagLibr
err.jspError("jsp.error.tld.missing_jar", uri);
}
return new TldResourcePath(url, uri, "META-INF/taglib.tld");
- } else {
- return new TldResourcePath(url, uri);
+ } else if (uri.startsWith("/WEB-INF/lib/") ||
uri.startsWith("/WEB-INF/classes/") ||
+ (uri.startsWith("/WEB-INF/tags/") && uri.endsWith(".tld")&&
!uri.endsWith("implicit.tld"))) {
+ err.jspError("jsp.error.tld.invalid_tld_file", uri);
}
+ return new TldResourcePath(url, uri);
}
private TagInfo createTagInfo(TagXml tagXml) throws JasperException {
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1746989&r1=1746988&r2=1746989&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Mon
Jun 6 13:23:45 2016
@@ -142,6 +142,7 @@ jsp.error.bad_attribute=Attribute {0} in
jsp.error.tld.unable_to_get_jar=Unable to get JAR resource \"{0}\" containing
TLD: {1}
jsp.error.tld.missing=Unable to find taglib \"{0}\" for URI: {1}
jsp.error.tld.missing_jar=Missing JAR resource \"{0}\" containing TLD
+jsp.error.tld.invalid_tld_file=Invalid tld file: \"{0}\", see JSP
specification section 7.3.1 for more details
jsp.error.unable.to_find_method=Unable to find setter method for attribute: {0}
jsp.error.bad_tag=No tag \"{0}\" defined in tag library imported with prefix
\"{1}\"
jsp.error.xml.bad_tag=No tag \"{0}\" defined in tag library associated with
uri \"{1}\"
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1746989&r1=1746988&r2=1746989&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 6 13:23:45 2016
@@ -131,6 +131,10 @@
the class loader of the first web application to use expressions to be
pinned in memory. (markt)
</fix>
+ <fix>
+ <bug>59654</bug>: Improve error message when attempting to use a TLD
+ file from an invalid location. Patch provided by Huxing Zhang. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
