Merge branch 'apache:trunk' into trunk

Author: rgala

.github/workflows/linux.yml

@@ -17,55 +17,75 @@ jobs:
       matrix:
         include: 
           - name: Default
+            os: ubuntu-latest
+            # Check default shm decision logic for Linux:
+            config-output: APR_USE_SHMEM_MMAP_SHM APR_USE_SHMEM_MMAP_ANON
+          - name: Default (arm64)
+            os: ubuntu-22.04-arm
             # Check default shm decision logic for Linux:
             config-output: APR_USE_SHMEM_MMAP_SHM APR_USE_SHMEM_MMAP_ANON
           - name: Static
+            os: ubuntu-latest
             config: --enable-static
           - name: Maintainer-mode
+            os: ubuntu-latest
             config: --enable-maintainer-mode
           - name: Named SHM - SysV, Maintainer-mode
+            os: ubuntu-latest
             config: --enable-maintainer-mode --enable-sysv-shm
             config-output: APR_USE_SHMEM_SHMGET
           - name: Named SHM - Classic mmap, Maintainer-mode
+            os: ubuntu-latest
             config: --enable-maintainer-mode ac_cv_func_shm_open=no ac_cv_func_shmget=no
             config-output: APR_USE_SHMEM_MMAP_TMP
           - name: Pool-debug
+            os: ubuntu-latest
             config: --enable-pool-debug
           - name: Pool-debug, maintainer-mode
+            os: ubuntu-latest
             config: --enable-pool-debug --enable-maintainer-mode
           - name: Thread-debug, maintainer-mode
+            os: ubuntu-latest
             config: --enable-thread-debug --enable-maintainer-mode
           - name: Maintainer-mode, no IPv6
+            os: ubuntu-latest
             config: --enable-maintainer-mode --disable-ipv6
           - name: Maintainer-mode, -Werror
+            os: ubuntu-latest
             notest-cflags: -Werror
             config: --enable-maintainer-mode
           - name: With crypto
+            os: ubuntu-latest
             config: --with-crypto=yes --with-openssl=yes
             config-output: APU_HAVE_CRYPTO APU_HAVE_OPENSSL
           - name: ASan
+            os: ubuntu-latest
             # w/o ODBC since DSO unload leaks memory and fails the tests
             notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
             config: --with-odbc=no
           - name: ASan, pool-debug
+            os: ubuntu-latest
             # w/o ODBC since DSO unload leaks memory and fails the tests
             notest-cflags: -fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2
             config: --enable-pool-debug --with-odbc=no
           - name: UBsan
+            os: ubuntu-latest
             notest-cflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer -Werror -O2
           - name: LMDB
+            os: ubuntu-latest
             packages: liblmdb-dev
             notest-cflags: -Werror
             config: --enable-maintainer-mode --with-lmdb --with-dbm=lmdb
             config-output: APU_HAVE_LMDB
           - name: Berkeley DB v5.3
+            os: ubuntu-latest
             packages: libdb5.3-dev
             notest-cflags: -Werror
             config: --enable-maintainer-mode --with-berkeley-db --with-dbm=db5
             config-output: APU_HAVE_DB
       fail-fast: false
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     env:
       NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
     name: ${{ matrix.name }}

.github/workflows/windows.yml

@@ -28,6 +28,14 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: ON
+          - name: Default arm64
+            os: windows-11-arm
+            triplet: arm64-windows
+            arch: arm64
+            build-type: Debug
+            generator: Ninja
+            build-shared: ON
+            dso-build: ON
           - name: Use Expat
             os: windows-latest
             triplet: x64-windows
@@ -119,6 +127,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+    - name: Prepare Environment
+      shell: pwsh
+      run: |
+        $root = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+        Import-Module "$root\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+        $OldEnv = ls env:
+        Enter-VsDevShell -VsInstallPath $root -DevCmdArguments "-arch=${{ matrix.arch }}"
+        $NewEnv = ls env:
+
+        Compare-Object $OldEnv $NewEnv -Property Name, Value -CaseSensitive | Where-Object -Property SideIndicator -EQ "=>" | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
+
     - name: Install dependencies
       if: ${{ matrix.packages != '' }}
       run: vcpkg install --triplet ${{ matrix.triplet }} ${{ matrix.packages }}
@@ -130,7 +149,6 @@ jobs:
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
         cmake -B ${{github.workspace}}/build ^
           -G "${{ matrix.generator }}" ^
           -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^
@@ -145,7 +163,6 @@ jobs:
       # Build your program with the given configuration
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
         cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
 
     - name: Test

util-misc/apu_dso.c

@@ -146,7 +146,9 @@ apr_status_t apu_dso_load(apr_dso_handle_t **dlhandleptr,
 
     entry = apr_hash_get(dsos, module, APR_HASH_KEY_STRING);
     if (entry) {
-        *dlhandleptr = entry->handle;
+        if (dlhandleptr) {
+            *dlhandleptr = entry->handle;
+        }
         *dsoptr = entry->sym;
         return APR_EINIT;
     }