[tomcat8] 07/13: Enabled the APR library loading by default (required for HTTP/2 support)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch experimental
in repository tomcat8.

commit d3d0fb183fa534f31dc27b672c2e30a5fd581bd5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 17 00:38:27 2016 +0100

    Enabled the APR library loading by default (required for HTTP/2 support)
---
 debian/changelog                                      |  1 +
 debian/patches/0003-disable-APR-library-loading.patch | 14 --------------
 debian/patches/series                                 |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2b4bdc..f0532fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ tomcat8 (8.5.8-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Tomcat no longer builds tomcat-embed-logging-juli.jar
     - Updated the policy files
+  * Enabled the APR library loading by default (required for HTTP/2 support)
   * Adapted debian/orig-tar.sh to download the 8.5.x releases
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Nov 2016 18:44:57 +0100
diff --git a/debian/patches/0003-disable-APR-library-loading.patch b/debian/patches/0003-disable-APR-library-loading.patch
deleted file mode 100644
index 658fbba..0000000
--- a/debian/patches/0003-disable-APR-library-loading.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Disables APR library loading until we properly provide it.
-Author: Thierry Carrez <thierry.carrez at ubuntu.com>
---- a/conf/server.xml
-+++ b/conf/server.xml
-@@ -25,7 +25,9 @@
-   <Listener className="org.apache.catalina.security.SecurityListener" />
-   -->
-   <!--APR library loader. Documentation at /docs/apr.html -->
-+  <!--
-   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-+  -->
-   <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-   <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
diff --git a/debian/patches/series b/debian/patches/series
index 6da8b73..08d91e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0002-do-not-load-AJP13-connector-by-default.patch
-0003-disable-APR-library-loading.patch
 0004-split-deploy-webapps-target-from-deploy-target.patch
 0005-skip-test-failures.patch
 0006-add-JARs-below-var-to-class-loader.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git