diff --git a/LICENSE.txt b/LICENSE.txt index 9afbed5b72..54e66d37b4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -248,7 +248,7 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 6.0.41: + Tomcat 6.0.43: Copyright 1999-2014 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt index fdf2a31140..c64d393b10 100644 --- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt +++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt @@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. The Glassfish JSP 2.1 bundled in Jetty 6 is way too old. Retrieved from the file - apache-tomcat-6.0.41-deployer.tar.gz + apache-tomcat-6.0.43-deployer.tar.gz minus the following files and directores: diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar index 32818aef3a..def835a256 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar index e3bc712ba0..9c779fd396 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar index bc595102ec..c7f965777a 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar index ff13de88e5..f405513f54 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ diff --git a/apps/jetty/apache-tomcat/README-i2p.txt b/apps/jetty/apache-tomcat/README-i2p.txt index edeb05fcbb..503879d85c 100644 --- a/apps/jetty/apache-tomcat/README-i2p.txt +++ b/apps/jetty/apache-tomcat/README-i2p.txt @@ -1,7 +1,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. Retrieved from the file - apache-tomcat-6.0.41.tar.gz + apache-tomcat-6.0.43.tar.gz containing only a small subset of lib/tomcat-coyote.jar. diff --git a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar index da3061a5f1..1edfeca851 100644 Binary files a/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar and b/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar differ diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index fd9a9a45f7..991bab7bda 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -10,7 +10,7 @@ - + diff --git a/history.txt b/history.txt index 56363006c3..02355a8cef 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,5 @@ 2015-03-16 zzz + * Apache Tomcat 6.0.43 * Throttle: Reject tunnels based on job lag 2015-03-15 zzz