Author: schultz
Date: Thu Oct 24 13:00:06 2013
New Revision: 1535367
URL: http://svn.apache.org/r1535367
Log:
Update spec version and section number when rejecting a JAR file based upon
pre-defined list of trigger-classes.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1535367&r1=1535366&r2=1535367&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Thu Oct 24 13:00:06 2013
@@ -3446,8 +3446,8 @@ public class WebappClassLoader
JarEntry jarEntry = jarFile.getJarEntry(name);
if (jarEntry != null) {
log.info("validateJarFile(" + file +
- ") - jar not loaded. See Servlet Spec 2.3, "
- + "section 9.7.2. Offending class: " + name);
+ ") - jar not loaded. See Servlet Spec 3.0, "
+ + "section 10.7.2. Offending class: " + name);
return false;
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1535367&r1=1535366&r2=1535367&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 24 13:00:06 2013
@@ -78,6 +78,11 @@
<bug>55681</bug>: Ensure that the WebSocket session is made available
to <code>MessageHandler</code> method calls. (markt)
</fix>
+ <fix>
+ Updated servlet spec version and documentation section-number
reported
+ when JAR files are rejected for containing a trigger class
+ (e.g. javax.servlet.Servlet).
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
