Update to 6.0.45

Changelog:
Tomcat 6.0.45 (jfclere)

    Catalina

        fix	Back-port various improvements to the AprLifecycleListener including the fix for 57021 that improves logging when the Tomcat-Native DLL fails to load. (markt)
        add	57154: Add support for web applications (Context elements) that do not have a docBase. This is intended for use when embedding, such as Tomcat unit tests, when a web application is configured programmatically and does not serve any files. Based on a patch provided by Huxing Zhang. (kkolinko)
        add	57741: Enable the CGI servlet to use the standard error page mechanism. Note that if the CGI servlet's debug init parameter is set to 10 or higher then the standard error page mechanism will be bypassed and a debug response generated by the CGI servlet will be returned instead. (markt)
        fix	57896: Support defensive copying of "cookie" header so that unescaping double quotes in a cookie value does not corrupt original value of "cookie" header. This is an opt-in feature, enabled by org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER or org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property. (kkolinko)
        fix	58031: Make the (first) reason parameter parsing failed available as a request attribute and then use it to provide a better status code via the FailedRequstFilter (if configured). (markt)
        fix	58313: Fix concurrent access of encoders map when clearing encoders during Comet processing. (markt)
        fix	58508: Escape role names when generating associated MBeans in case the role name contains characters not permitted in an MBean name. (markt)
        fix	58582: Combined realm should perform background processing on its sub-realms. Based upon a patch provided by Aidan. (kkolinko)
        add	Move the functionality that provides redirects for context roots and directories where a trailing / is added from the Mapper to the DefaultServlet. This enables such requests to be processed by any configured Valves and Filters before the redirect is made. This behaviour is configurable via the mapperContextRootRedirectEnabled and mapperDirectoryRedirectEnabled attributes of the Context which may be used to restore the previous behaviour. (markt)
        fix	58635: Enable break points to be set within agent code when running Tomcat with a Java agent. Based on a patch by Huxing Zhang. (markt)
        fix	Add the StatusManagerServlet to the list of Servlets that can only be loaded by privileged applications. (markt)
        fix	Remove redundant copy of catalina.properties from o.a.c.startup. Generate this copy during the ant "compile" task. (kkolinko)
        fix	58817: Fix ArrayIndexOutOfBoundsException caused by MapperListener when ROOT context is being undeployed and mapperContextRootRedirectEnabled="false". (kkolinko)
        fix	58836: Correctly merge query string parameters when processing a forwarded request where the target includes a query string that contains a parameter with no value. (markt/kkolinko)
        add	Allow singleton server instance stored by ServerFactory to be cleared. Allow ResourceLinkFactory to be initialized more than once. This is used by unit tests when running several copies of Tomcat sequentially in the same JVM. When running with a SecurityManager the initialization method of ResourceLinkFactory is protected by requiring a RuntimePermission. (kkolinko)
        add	Extend the feature available in the cluster session manager implementations that enables session attribute replication to be filtered bases on attribute name to all session manager implementations. Note that configuration attribute name has changed from sessionAttributeFilter to sessionAttributeNameFilter. Apply the filter on load as well as unload to ensure that configuration changes made while the web application is stopped are applied to any persisted data. (markt)
        add	Extend the session attribute filtering options to include filtering based on the implementation class of the value and optional WARN level logging if an attribute is filtered. These options are available for all of the Manager implementations that ship with Tomcat. When a SecurityManager is used filtering will be enabled by default. (markt)
        fix	58946: Ensure that the request parameter map remains immutable when processing via a RequestDispatcher. (markt)

    Coyote

        add	Align the Java side of the tc-native connector with the Tomcat 7 implementation to ease future maintenance. (markt)
        fix	51503: Add additional validation that prevents a connector from starting if it does not have a valid port number. (kkolinko)
        add	52028: Add support for automatic binding to a free port by a connector if the special value of zero is used for the port. This is mainly useful in embedded and testing scenarios. (kkolinko)
        fix	52926: Avoid NPE when an NIO Comet connection times out on one thread at the same time as it is closed on another thread. (markt/kkolinko)
        fix	57943: Prevent the same socket being added to the cache twice. Patch based on analysis by Ian Luo / Sun Qi. (markt/kkolinko)
        fix	Improve HTTP header validation. (markt)

    Web applications

        fix	57971: Correct the documentation for the cluster configuration setting recoverySleepTime. (markt)
        fix	58112: Update the documentation for using the Catalina tasks in an Apache Ant build file. (markt)
        fix	Improve the Javadoc for some of the APR socket read functions that have inconsistent behaviour for return values. (markt)
        add	58255: Document the Semaphore valve. Patch provided by Kyohei Nakamu. (markt)
        fix	58631: Correct the continuation character use in the Windows Service How-To page of the documenation web application. (markt)
        fix	Correct some typos in the JNDI resources How-To. (markt)
        fix	Add a redirect to the web interface to the root of the Manager web application. (markt)
        fix	Don't create sessions unnecessarily in the Manager application. (markt)
        fix	Add a redirect to the web interface to the root of the Host Manager web application. (markt)
        fix	Don't create sessions unnecessarily in the Host Manager application. (markt)

    Other

        fix	Ensure JULI adapters JAR in Tomcat extras package does not include the LogFactoryImpl[$*] classes. Based on patch provided by Benjamin Gandon. (kkolinko)
        code	Convert test classes to JUnit 4. (kkolinko)
        update	58596: Clarify the description in RUNNING.txt of how environment variables are used. (markt)
        update	Update the NSIS Installer used to build the Windows Installers to version 2.50. (markt/kkolinko)
        add	Add framework for client-server unit tests, porting it from Tomcat 7. Add support for running the tests with Apache Ant. (kkolinko)
        update	Update to Tomcat Native Library version 1.1.34. (jfclere)
        update	Remove support for Intel Itanium CPU (i64, IA-64) in the Windows installer, as the current release of Tomcat Native does not have binaries for that processor architecture. (jfclere)

3 files changed, 10 insertions, 9 deletions

diff --git a/www/apache-tomcat6/Makefile b/www/apache-tomcat6/Makefile
index ee917d86e1b..c345129c4a8 100644
--- a/www/apache-tomcat6/Makefile
+++ b/www/apache-tomcat6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/05/19 19:33:54 spz Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/28 10:14:53 ryoon Exp $
 #
 
 DISTNAME=	apache-tomcat-${TOMCAT_VER}
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-TOMCAT_VER=		6.0.44
+TOMCAT_VER=		6.0.45
 TOMCAT_HOME=		${PREFIX}/share/tomcat
 EGDIR=			${PREFIX}/share/examples/tomcat
 DOCDIR=			${PREFIX}/share/doc/tomcat
diff --git a/www/apache-tomcat6/PLIST b/www/apache-tomcat6/PLIST
index 385029dd683..69e759eb273 100644
--- a/www/apache-tomcat6/PLIST
+++ b/www/apache-tomcat6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2015/05/19 19:33:54 spz Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/02/28 10:14:53 ryoon Exp $
 share/doc/tomcat/LICENSE
 share/doc/tomcat/NOTICE
 share/doc/tomcat/RELEASE-NOTES
@@ -464,6 +464,7 @@ share/tomcat/webapps/host-manager/images/fix.gif
 share/tomcat/webapps/host-manager/images/tomcat.gif
 share/tomcat/webapps/host-manager/images/update.gif
 share/tomcat/webapps/host-manager/images/void.gif
+share/tomcat/webapps/host-manager/index.jsp
 share/tomcat/webapps/host-manager/manager.xml
 share/tomcat/webapps/manager/META-INF/context.xml
 share/tomcat/webapps/manager/WEB-INF/jsp/401.jsp
@@ -480,6 +481,6 @@ share/tomcat/webapps/manager/images/fix.gif
 share/tomcat/webapps/manager/images/tomcat.gif
 share/tomcat/webapps/manager/images/update.gif
 share/tomcat/webapps/manager/images/void.gif
+share/tomcat/webapps/manager/index.jsp
 share/tomcat/webapps/manager/status.xsd
 share/tomcat/webapps/manager/xform.xsl
-@pkgdir share/tomcat/conf
diff --git a/www/apache-tomcat6/distinfo b/www/apache-tomcat6/distinfo
index 82f6212181e..acb17d0e595 100644
--- a/www/apache-tomcat6/distinfo
+++ b/www/apache-tomcat6/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 02:46:49 agc Exp $
+$NetBSD: distinfo,v 1.15 2016/02/28 10:14:53 ryoon Exp $
 
-SHA1 (apache-tomcat-6.0.44.tar.gz) = a9b20a4f1392e11bb04d9691e3e84a988e73d910
-RMD160 (apache-tomcat-6.0.44.tar.gz) = 2b942edf0f8b7267162b540c76b048f241b56807
-SHA512 (apache-tomcat-6.0.44.tar.gz) = 9cf9fa6c97509c8e7cfef23edd67b581ddd83cff71db835cdc1bc8264536c396bb7499c4083da869ea878b9dec777c08cba0fe564b155e6dec79719dddf33b36
-Size (apache-tomcat-6.0.44.tar.gz) = 7065218 bytes
+SHA1 (apache-tomcat-6.0.45.tar.gz) = f05fad07e354c9f6fff8137e9de31f4365d3766a
+RMD160 (apache-tomcat-6.0.45.tar.gz) = 5561452f5d2a8c6de5f2334d9f806acfcb69b4ef
+SHA512 (apache-tomcat-6.0.45.tar.gz) = b185080d1daaa30ecfc8870c1c9342007f815308a9dac52aa4d92f101b270aae2cf02fbe1fdb142b19859df34f40452f7448d023383ab2c6b0b823908edd7b1a
+Size (apache-tomcat-6.0.45.tar.gz) = 7073612 bytes