Update to 7.0.35

Changelog:
Tomcat 7.0.35 (markt)

    Catalina
        fix	54247: Prevent ClassNotFoundExceptions on stop when running as a service. (markt)
        fix	54249: Ensure resource properties are available when the context path contains encoded characters such as a space. This triggered compilation issues in Jasper. Patch provided by Polina Genova. (markt)
        fix	54256: Improve error reporting when a JAR file fails extension validation by including the name of the JAR file in the exception. (markt)
        fix	Allow web applications to be stopped cleanly even if filters throw exceptions when their destroy() method is called. (markt/kkolinko)
        fix	Fix memory leak of servlet instances when running with a SecurityManager and either init() or destroy() methods fail or the servlet is a SingleThreadModel one. (kkolinko)
        code	Cleanup method cache lookup code in SecurityUtil class. (kkolinko)
        add	Make the Tomcat 7 non-JSR356 WebSocket implementation non-blocking (where supported by the connector) between the HTTP upgrade and the first WebSocket message from the client to the server. (markt)
        fix	54262: Ensure that an empty <absolute-ordering /> element in the main web.xml file disables scanning for web fragments. Based on a patch by Violeta Georgieva. (markt)
        fix	54284: As per clarification from the Servlet EG, anonymous Filters and Servlets are not permitted. Patch by Violeta Georgieva. (markt)
        fix	54371: Prevent exceptions when processing web fragments for unexpanded WAR files when the context path contains characters that need to be encoded in URLs such as spaces. Based on a patch by Polina Genova. (markt)
        add	54372: Make HTTP Digest authentication header parsing tolerant of invalid headers sent by known buggy clients. (markt)
        fix	54377: Correctly set request attributes for AccessLog in RemoteIpFilter. Patch by Violeta Georgieva. (markt)
        fix	54379: Implement support for post-construct and pre-destroy elements in web.xml. Patch by Violeta Georgieva. (markt)
        fix	54380: Do not try to register servlets or contexts into the mapper too early (which just caused a warning to be logged). (kkolinko)
        fix	Fix NPE in WebappLoader.stopInternal when stop is called after a failed start. (kkolinko)
        add	54381: Add support for receiving WebSocket pong messages. (markt)
        fix	54382: Fix NPE when SSI processing is enabled and an empty SSI directive is present. (markt)
        fix	Fix ArrayIndexOutOfBoundsException in HttpParser when parsing incorrect HTTP headers. (kkolinko)
        fix	54387: Deployment must fail when multiple servlets are mapped to the same url-pattern. (markt)
        fix	54391: Provide a value for the javax.servlet.context.orderedLibs attribute. (markt)

    Coyote
        fix	54248: Ensure that byte order marks are swallowed when using a Reader to read a request body with a BOM for those encodings that require byte order marks. (markt)
        fix	Fix release of processors in AjpNioProtocol. Wrong object was used as a key in the connections map. (kkolinko)

    Jasper
        add	54240: Add support for auto-detection and configuration of JARs on the classpath that provide tag plug-in implementations. Based on a patch by Sheldon Shao. (markt)
        fix	54241: Revert the fix for 35410 as it was not compliant with the JSP specification, specifically that <%= obj %> must be translated to out.print(obj) which in turn becomes out.write(String.valueOf(obj)). This will trigger a NullPointerException if obj.toString() returns null. The fix for 35410 incorrectly suppressed the NullPointerException in this case. (markt)
        fix	54242: Correct handle null iterations with in the JSTL ForEach tag plug-in implementation. Patch provided by Sheldon Shao. (markt)
        fix	54260: Avoid NullPointerException when using JSP unloading and tag files. (markt)
        fix	54370: Improve handling of nulls when trying to match sets of parameters to a method in EL. (markt)
        fix	54338: Correctly coerce the value to the expected type when using the tag plug-in for the JSTL set tag. Patch provided by Sheldon Shao. (markt)

    Web applications
        fix	54244: Clarify the documentation for the BIO and NIO SSL configuration attributes sslEnabledProtocols and sslProtocol within the documentation web application. (markt)
        add	Integrate documentation of Tomcat 7 with Apache Comments System. People can leave their comments when reading documentation online at the tomcat.apache.org site. (rjung)

    Other
        fix	54390: Use 'java_home' on Mac OS X to auto-detect JAVA_HOME. (schultz)

3 files changed, 8 insertions, 7 deletions

diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile
index bb3c3164f82..934232481ed 100644
--- a/www/apache-tomcat7/Makefile
+++ b/www/apache-tomcat7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/12/16 10:39:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2013/01/25 21:09:26 ryoon Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		7.0.34
+TOMCAT_VER=		7.0.35
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat7/PLIST b/www/apache-tomcat7/PLIST
index 8f4f82a753f..f7f7b1f0325 100644
--- a/www/apache-tomcat7/PLIST
+++ b/www/apache-tomcat7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/12/16 10:37:32 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/25 21:09:26 ryoon Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -100,6 +100,7 @@ share/tomcat/webapps/docs/cgi-howto.html
 share/tomcat/webapps/docs/changelog.html
 share/tomcat/webapps/docs/class-loader-howto.html
 share/tomcat/webapps/docs/cluster-howto.html
+share/tomcat/webapps/docs/comments.html
 share/tomcat/webapps/docs/config/ajp.html
 share/tomcat/webapps/docs/config/cluster-channel.html
 share/tomcat/webapps/docs/config/cluster-deployer.html
diff --git a/www/apache-tomcat7/distinfo b/www/apache-tomcat7/distinfo
index afc36b8cd85..da92d8d53ad 100644
--- a/www/apache-tomcat7/distinfo
+++ b/www/apache-tomcat7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/12/16 10:37:32 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2013/01/25 21:09:26 ryoon Exp $
 
-SHA1 (apache-tomcat-7.0.34.tar.gz) = 881569860855458ed57c967e3cb10632ad951549
-RMD160 (apache-tomcat-7.0.34.tar.gz) = c202cd4cf7d4e8c0a7cd5b9e1e8fecbe3467c6c5
-Size (apache-tomcat-7.0.34.tar.gz) = 7744774 bytes
+SHA1 (apache-tomcat-7.0.35.tar.gz) = 62a50fcd4c4144971003d3d2688129ae33cce3e6
+RMD160 (apache-tomcat-7.0.35.tar.gz) = ab5e014fef4c7109ee7c9a595975b0e1a9f65d4f
+Size (apache-tomcat-7.0.35.tar.gz) = 7784675 bytes