Update to 7.0.57

Changelog:
Tomcat 7.0.57 (violetagg)

    Catalina

        add	47919: Extend the information logged when Tomcat starts to optionally log the values of command line arguments (enabled by default) and environment variables (disabled by default). Note that the values added to CATALINA_OPTS and JAVA_OPTS environment variables will be logged, as they are used to build up the command line. (markt)
        add	56401: Log version information when Tomcat starts. (markt/kkolinko)
        fix	57022: Ensure SPNEGO authentication continues to work with the JNDI Realm using delegated credentials with recent Oracle JREs. (markt)
        fix	Correct a couple of NPEs in the JNDI Realm that could be triggered with when not specifying a roleBase and enabling roleSearchAsUser. (markt)
        fix	Remove the unnecessary registration of context.xml as a redeploy resource. The context.xml having an external docBase has already been registered as a redeploy resources at first. (kfujino)
        fix	Improve the previous fix for 56401. Avoid logging version information in the constructor since it then gets logged at undesirable times such as when using StoreConfig. (markt)
        fix	57105: When parsing web.xml do not limit the buffer element of the jsp-property-group element to integer values as the allowed values are <number>kb or none. (markt)
        update	Update the minimum required version of the Tomcat Native library (if used) to 1.1.32. (markt)
        update	57144: Improve ClientAbortException to provide non-null message. (kkolinko)

    Coyote

        add	53952: Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a patch by Marcel Šebek. This feature requires Tomcat Native library 1.1.32 or later. (schultz/jfclere)
        add	Disable SSLv3 by default for JSSE based HTTPS connectors (BIO and NIO). The change also ensures that SSLv2 is disabled for these connectors although SSLv2 should already be disabled by default by the JRE. (markt)
        add	Disable SSLv3 by default for the APR/native HTTPS connector. (markt)
        fix	Do not increase remaining counter at end of stream in IdentityInputFilter. (kkolinko)

    Jasper

        fix	57099: Ensure that semi-colons are not permitted in JSP import page directives. (markt)

    Cluster

        fix	Avoid possible integer overflows reported by Coverity Scan. (fschumacher)

    WebSocket

        fix	57054: Correctly handle the case in the WebSocket client when the HTTP response to the upgrade request can not be read in a single pass; either because the buffer is too small or the server sent the response in multiple packets. (markt)
        fix	Fix client subprotocol handling. (remm)
        fix	Add null checks for arguments in remote endpoint. (remm/kkolinko)
        fix	57091: Work around the behaviour of the Oracle JRE when creating new threads in an applet environment that breaks the WebSocket client implementation. Patch provided by Niklas Hallqvist. (markt)
        fix	57118: Ensure that that an EncodeException is thrown by RemoteEndpoint.Basic.sendObject(Object) rather than an IOException when no suitable Encoder is configured for the given Object. (markt)

    Web applications

        fix	Correct documentation for ServerCookie.ALLOW_NAME_ONLY system property. (kkolinko)
        fix	57049: Clarified that jvmRoute can be set in <Engine>'s jvmRoute or in a system property. (schultz)
        fix	Correct version of Java WebSocket mentioned in documentation (s/1.0/1.1/). (markt/kkolinko)
        update	In examples web application move Async and Comet examples from JSP to Servlet examples page. (kkolinko)
        update	Suppress timestamp comments and enable charset header in Javadoc. (kkolinko)

    jdbc-pool

        fix	57079: Use Tomcat version number for jdbc-pool module when building and shipping the module as part of Tomcat. (markt/kkolinko)
        fix	Fix broken overview page in javadoc generated via "javadoc" task in jdbc-pool build.xml file. (kkolinko)

    Other

        update	56079: The Apache Tomcat Windows service and the Apache Tomcat Windows service monitor application are now digitally signed. (markt)
        fix	Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format instead of 12-hour one and use UTC timezone. (markt/kkolinko)
        update	Improve Tomcat build script to ensure that only one ecj-nn.jar file is present in Tomcat lib directory when Eclipse JDT Compiler is updated to a new version. (kkolinko)
        update	56596: Update to Tomcat Native Library version 1.1.32 to pick up the Windows binaries that are based on OpenSSL 1.0.1j and APR 1.5.1. (markt)
        code	In Tomcat tests: log name of the current test method at start time. (kkolinko)

3 files changed, 13 insertions, 13 deletions

diff --git a/www/apache-tomcat7/Makefile b/www/apache-tomcat7/Makefile
index c7bb6a5a56b..af16b07b7bc 100644
--- a/www/apache-tomcat7/Makefile
+++ b/www/apache-tomcat7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/10/25 15:19:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2014/12/20 07:49: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.56
+TOMCAT_VER=		7.0.57
 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 ca1309f1872..df92b499341 100644
--- a/www/apache-tomcat7/PLIST
+++ b/www/apache-tomcat7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/10/25 15:19:45 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/12/20 07:49:26 ryoon Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -405,12 +405,6 @@ share/tomcat/webapps/examples/jsp/cal/cal2.jsp
 share/tomcat/webapps/examples/jsp/cal/cal2.jsp.html
 share/tomcat/webapps/examples/jsp/cal/calendar.html
 share/tomcat/webapps/examples/jsp/cal/login.html
-share/tomcat/webapps/examples/jsp/chat/index.jsp
-share/tomcat/webapps/examples/jsp/chat/index.jsp.html
-share/tomcat/webapps/examples/jsp/chat/login.jsp
-share/tomcat/webapps/examples/jsp/chat/login.jsp.html
-share/tomcat/webapps/examples/jsp/chat/post.jsp
-share/tomcat/webapps/examples/jsp/chat/post.jsp.html
 share/tomcat/webapps/examples/jsp/checkbox/CheckTest.html
 share/tomcat/webapps/examples/jsp/checkbox/check.html
 share/tomcat/webapps/examples/jsp/checkbox/checkresult.jsp
@@ -568,6 +562,12 @@ share/tomcat/webapps/examples/jsp/tagplugin/notes.html
 share/tomcat/webapps/examples/jsp/xml/xml.html
 share/tomcat/webapps/examples/jsp/xml/xml.jsp
 share/tomcat/webapps/examples/jsp/xml/xml.jsp.html
+share/tomcat/webapps/examples/servlets/chat/index.jsp
+share/tomcat/webapps/examples/servlets/chat/index.jsp.html
+share/tomcat/webapps/examples/servlets/chat/login.jsp
+share/tomcat/webapps/examples/servlets/chat/login.jsp.html
+share/tomcat/webapps/examples/servlets/chat/post.jsp
+share/tomcat/webapps/examples/servlets/chat/post.jsp.html
 share/tomcat/webapps/examples/servlets/cookies.html
 share/tomcat/webapps/examples/servlets/helloworld.html
 share/tomcat/webapps/examples/servlets/images/code.gif
diff --git a/www/apache-tomcat7/distinfo b/www/apache-tomcat7/distinfo
index f89e6096e8c..f2858c0014b 100644
--- a/www/apache-tomcat7/distinfo
+++ b/www/apache-tomcat7/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2014/10/25 15:19:45 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2014/12/20 07:49:26 ryoon Exp $
 
-SHA1 (apache-tomcat-7.0.56.tar.gz) = 21c16dfed30b4a15c129e4448e63834103c88272
-RMD160 (apache-tomcat-7.0.56.tar.gz) = 9e9d3d5b2949b2b56805c82c18b0a62b37846a63
-Size (apache-tomcat-7.0.56.tar.gz) = 8894241 bytes
+SHA1 (apache-tomcat-7.0.57.tar.gz) = 49ffffe9c2e534e66f81b3173cdbf7e305a75fe2
+RMD160 (apache-tomcat-7.0.57.tar.gz) = 5675ba0be02527a2082283d4c3bd6a4e9456ff9d
+Size (apache-tomcat-7.0.57.tar.gz) = 8900571 bytes