From: Joe Orton <jorton@apache.org>
Date: Tue, 24 Nov 2020 08:27:00 +0000 (+0000)
Subject: For pool-debug builds, use APR/APR-util 1.7.x branches to pick
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=861e918c71bd83c9649cbe759073b67a80467f7b;p=thirdparty%2Fapache%2Fhttpd.git

For pool-debug builds, use APR/APR-util 1.7.x branches to pick
up e.g. the r1883751 locking fixes.

Re-enable mod_http2 and mod_ssl_ct in prefork pool-debug build
after r1883704 and r1883667.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1883776 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 9c9748c6651..bd635a0bfd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -238,22 +238,25 @@ jobs:
            CLEAR_CACHE=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1
-      env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
-           APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
+      env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+           APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
            CONFIG="--enable-mods-shared=reallyall"
            TEST_MALLOC=1
+           CLEAR_CACHE=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Shared MPMs (event), pool-debug, SSL/TLS variants
-      env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
-           APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
+      env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+           APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
            CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=event"
            TEST_MALLOC=1 TEST_SSL=1
+           CLEAR_CACHE=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Shared MPMs (prefork), pool-debug, SSL/TLS variants
-      env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
-           APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap"
-           CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=prefork --disable-http2 --disable-ssl-ct"
+      env: APR_VERSION=1.7.x APR_CONFIG="--enable-pool-debug"
+           APU_VERSION=1.7.x APU_CONFIG="--with-crypto --with-ldap"
+           CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=prefork"
            TEST_MALLOC=1 TEST_SSL=1
+           CLEAR_CACHE=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1, pool-debug, LDAP
       env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"