From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 11 Dec 2020 15:00:24 +0000 (+0000)
Subject: ci: ASan and prefork w/ mod_http2 should be good for 2.4.x now.
X-Git-Tag: 2.4.47~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=696491d23faba6de1cfa14d144f39e96c556414b;p=thirdparty%2Fapache%2Fhttpd.git

ci: ASan and prefork w/ mod_http2 should be good for 2.4.x now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1884321 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index f60e89c7ac1..1660c932b91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -260,7 +260,7 @@ jobs:
     - name: Linux Ubuntu, Shared MPMs (prefork), pool-debug, SSL/TLS variants
       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 --disable-http2"
+           CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all --with-mpm=prefork"
            TEST_MALLOC=1 TEST_SSL=1
            CLEAR_CACHE=1
     # -------------------------------------------------------------------------
@@ -311,7 +311,6 @@ jobs:
            CONFIG="--enable-mods-shared=reallyall --disable-http2"
            TEST_UBSAN=1
     # -------------------------------------------------------------------------
-    - if: *condition_not_24x
       name: Linux Ubuntu Focal, ASan
       dist: focal
       env: NOTEST_CFLAGS="-ggdb -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer"
@@ -321,7 +320,6 @@ jobs:
            TEST_ASAN=1
            CLEAR_CACHE=1
     # -------------------------------------------------------------------------
-    - if: *condition_not_24x
       name: Linux Ubuntu Focal, ASan, pool-debug
       dist: focal
       env: NOTEST_CFLAGS="-ggdb -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer"