From: Joe Orton <jorton@apache.org>
Date: Wed, 9 Apr 2025 15:53:57 +0000 (+0000)
Subject: Merge r1921307, r1921308, r1921309 from trunk:
X-Git-Tag: 2.4.64-rc1-candidate~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb2642179dd7efe44e15e43de388fa9041a932a6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1921307, r1921308, r1921309 from trunk:

CI: Flush the CPAN cache if /usr/bin/perl has been updated since
the cache was built. Possible fix for 2.4.x failure seen here:

https://github.com/apache/httpd/actions/runs/11322484507/job/31483266212

SSLeay.c: loadable library and perl binaries are mismatched (got first handshake key 0xeb00080, needed 0xf380080)

perldiag(1) describes this as a mismatch between libraries and binaries,
likely solved by reinstalling XS modules:

https://github.com/Perl/perl5/blob/77b78882c76e7461ccc4dcf2eb3afb9644836a72/pod/perldiag.pod#L3617

CI: Second attempt to fix stale XS cache issue.

Cache the "perl -V" output and flush the cache if it changes.

CI: Fix borked test for perl -V in r1921308.



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

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 38591a66d3..7c0d1f7877 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -73,6 +73,21 @@ echo "add-auto-load-safe-path $HOME/work/httpd/httpd/.gdbinit" >> $HOME/.gdbinit
 if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
     # Clear CPAN cache if necessary
     if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi
+
+    if ! perl -V > perlver; then
+        : Perl binary broken
+        perl -V
+        exit 1
+    fi
+
+    # Compare the current "perl -V" output with the output at the time
+    # the cache was built; flush the cache if it's changed to avoid
+    # failure later when /usr/bin/perl refuses to load a mismatched XS
+    # module.
+    if ! cmp -s perlver ~/perl5/.perlver; then
+        : Purging cache since "perl -V" output has changed
+        rm -rf ~/perl5
+    fi
     
     cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
 
@@ -85,11 +100,11 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
     # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct
     # otherwise.
     CC=gcc cpanm --notest $pkgs
-
-    # Set cache key.
-    echo $pkgs > ~/perl5/.key
     unset pkgs
 
+    # Cache the perl -V output for future verification.
+    mv perlver ~/perl5/.perlver
+
     # Make a shallow clone of httpd-tests git repo.
     git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
 fi