Merge branch 'apache:trunk' into uuid_usability_test_fix

Author: rgala

.github/workflows/linux.yml

@@ -17,55 +17,79 @@ 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
+            # Check various defaults for Linux
+            config-private: >-
+              HAVE_EPOLL HAVE_C_VARARRAYS HAVE_CALLOC HAVE_EXPAT_H HAVE_FLOCK HAVE_FORK
+              HAVE_GAI_ADDRCONFIG HAVE_GAI_STRERROR GETSERVBYNAME_R_GLIBC2
+          - 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 }}
@@ -81,8 +105,11 @@ jobs:
     - name: configure
       run: ./configure --prefix=/tmp/apr ${{ matrix.config }}
     - if: ${{ matrix.config-output != '' }}
-      name: check for expected configure output ${{ matrix.config-output }}
+      name: check for expected apr.h definitions ${{ matrix.config-output }}
       run: for var in ${{ matrix.config-output }}; do grep "^#define *${var} *1" include/apr.h; done
+    - if: ${{ matrix.config-private != '' }}
+      name: check for expected apr_private.h definitions ${{ matrix.config-private }}
+      run: for var in ${{ matrix.config-private }}; do grep "^#define *${var} *1" include/arch/unix/apr_private.h; done
     - name: make
       run: make $MARGS
     - name: install

.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

build/apr_common.m4

@@ -439,14 +439,13 @@ eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
 
 define(APR_END_DECISION,[dnl
 if test ".$ac_decision" = .; then
-    echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2
-    exit 1
+    AC_MSG_ERROR([decision on $ac_decision_item failed])
 else
     if test ".$ac_decision_msg" = .; then
         ac_decision_msg="$ac_decision"
     fi
     AC_DEFINE_UNQUOTED(${ac_decision_item})
-    AC_MSG_RESULT([decision on $ac_decision_item... $ac_decision_msg])
+    AC_MSG_NOTICE([decision on $ac_decision_item... $ac_decision_msg])
 fi
 ])
 
@@ -467,19 +466,11 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
    CFLAGS="$CFLAGS -Werror"
  fi
  AC_COMPILE_IFELSE(
-  [AC_LANG_SOURCE(
-   [
-#ifndef PACKAGE_NAME
-#include "confdefs.h"
-#endif
-   ]
-   [[$1]]
-   [int main(int argc, const char *const *argv) {]
-   [[$2]]
-   [   return 0; }]
-  )], [CFLAGS=$apr_save_CFLAGS
-$3],  [CFLAGS=$apr_save_CFLAGS
-$4])
+  [AC_LANG_PROGRAM([[$1]], [[$2]])],
+  [CFLAGS=$apr_save_CFLAGS
+   $3],
+  [CFLAGS=$apr_save_CFLAGS
+   $4])
 ])
 
 dnl
@@ -775,8 +766,7 @@ if test -z "$LAYOUT"; then
 fi
 APR_LAYOUT($srcdir/config.layout, $LAYOUT, $2)
 
-AC_MSG_CHECKING(for chosen layout)
-AC_MSG_RESULT($layout_name)
+AC_MSG_NOTICE([chosen layout: $layout_name])
 ])
 
 

build/apr_network.m4

@@ -259,11 +259,12 @@ APR_TRY_COMPILE_NO_WARNING([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <stdio.h>
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
                           (char *) 0, 0, (struct hostent **) 0, &tmp);
 /* use tmp to suppress the warning */
-tmp=0;
+puts(tmp ? "non-zero" : "zero");
 ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
 
 if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
@@ -287,11 +288,12 @@ APR_TRY_COMPILE_NO_WARNING([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <stdio.h>
 ],[
 int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, 
                           (struct hostent_data *) 0);
 /* use tmp to suppress the warning */
-tmp=0;
+puts(tmp ? "non-zero" : "zero");
 ], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
 
 if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
@@ -327,12 +329,13 @@ APR_TRY_COMPILE_NO_WARNING([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#include <stdio.h>
 ],[
 int tmp = getservbyname_r((const char *) 0, (const char *) 0,
                           (struct servent *) 0, (char *) 0, 0,
                           (struct servent **) 0);
 /* use tmp to suppress the warning */
-tmp=0;
+puts(tmp ? "non-zero" : "zero");
 ], ac_cv_getservbyname_r_style=glibc2, ac_cv_getservbyname_r_style=none)
 
 if test "$ac_cv_getservbyname_r_style" = "none"; then
@@ -354,11 +357,12 @@ if test "$ac_cv_getservbyname_r_style" = "none"; then
     #ifdef HAVE_STDLIB_H
     #include <stdlib.h>
     #endif
+    #include <stdio.h>
     ],[
     struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0,
                                           (struct servent *) 0, (char *) 0, 0);
     /* use tmp to suppress the warning */
-    tmp=NULL;
+    puts(tmp ? "non-zero" : "zero");
     ], ac_cv_getservbyname_r_style=solaris, ac_cv_getservbyname_r_style=none)
 fi
 
@@ -381,11 +385,12 @@ if test "$ac_cv_getservbyname_r_style" = "none"; then
     #ifdef HAVE_STDLIB_H
     #include <stdlib.h>
     #endif
+    #include <stdio.h>
     ],[
     int tmp = getservbyname_r((const char *) 0, (const char *) 0,
                               (struct servent *) 0, (struct servent_data *) 0);
     /* use tmp to suppress the warning */
-    tmp=0;
+    puts(tmp ? "non-zero" : "zero");
     ], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none)
 fi
 ])

build/buildcheck.sh

@@ -15,11 +15,11 @@ else
   echo "buildconf: python version $py_version (ok)"
 fi
 
-# autoconf 2.59 or newer
+# autoconf 2.61 or newer
 ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
 if test -z "$ac_version"; then
   echo "buildconf: autoconf not found."
-  echo "           You need autoconf version 2.59 or newer installed"
+  echo "           You need autoconf version 2.61 or newer installed"
   echo "           to build APR from SVN."
   res=1
 else

configure.in

@@ -156,12 +156,14 @@ if test "x$host_alias" != x; then
     APR_CROSS_COMPILING=maybe
   elif test "x$build_alias" != "x$host_alias"; then
     APR_CROSS_COMPILING=yes
+  else
+    APR_CROSS_COMPILING=no
   fi
 else
     APR_CROSS_COMPILING=no
 fi
-
 AC_SUBST(APR_CROSS_COMPILING)
+AC_MSG_NOTICE([cross-compilation detection: $APR_CROSS_COMPILING])
 
 # Libtool might need this symbol -- it must point to the location of
 # the generated libtool script (not necessarily the "top" build dir).
@@ -1831,6 +1833,7 @@ AC_TYPE_UID_T
 AC_CHECK_TYPE(ssize_t, int)
 AC_C_INLINE
 AC_C_CONST
+AC_C_VARARRAYS
 AC_FUNC_SETPGRP
 
 APR_CHECK_SOCKLEN_T
@@ -1926,6 +1929,8 @@ else
     AC_ERROR([could not detect a 64-bit integer type])
 fi
 
+AC_MSG_NOTICE([for apr_(u)int64_t using $int64_strfn and ${int64_value}/${uint64_value}])
+
 # If present, allow the C99 macro INT64_C to override our conversion.
 #
 # HP-UX's ANSI C compiler provides this without any includes, so we
@@ -2107,7 +2112,6 @@ else
     aprlfs=0     
 fi
 
-AC_MSG_CHECKING([which type to use for apr_off_t])
 if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
     # LFS is go!
     off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT'
@@ -2163,7 +2167,7 @@ else
     off_t_strfn='strtoi'
     off_t_size=4
 fi
-AC_MSG_RESULT($off_t_value)
+AC_MSG_NOTICE([for apr_off_t using $off_t_strfn and $off_t_value])
 
 
 # Regardless of whether _LARGEFILE64_SOURCE is used, on some
@@ -2195,7 +2199,7 @@ case $host in
     fi
     ;;
 esac
-AC_MSG_NOTICE([using $ino_t_value for ino_t])
+AC_MSG_NOTICE([for apr_ino_t using $ino_t_value])
 
 # Checks for endianness
 AC_C_BIGENDIAN
@@ -2418,18 +2422,6 @@ fi
 
 AC_SUBST(have_proc_invoked)
 
-AC_MSG_CHECKING(for Variable Length Arrays)
-APR_TRY_COMPILE_NO_WARNING([#include <stdio.h>],
-[
-    int foo[argc];
-    foo[0] = 0;
-    printf("%d\n", foo[0]);
-], vla_msg=yes, vla_msg=no )
-AC_MSG_RESULT([$vla_msg])
-if test "$vla_msg" = "yes"; then
-    AC_DEFINE(HAVE_VLA, 1, [Define if C compiler supports VLA])
-fi
-
 AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
 AC_TRY_RUN([
 #include <sys/types.h>

docs/doxygen.conf

@@ -41,3 +41,4 @@ EXCLUDE_PATTERNS="*/acconfig.h" \
 
 GENERATE_TAGFILE=docs/dox/apr.tag
 
+DOT_GRAPH_MAX_NODES=99

include/apr_general.h

@@ -239,7 +239,7 @@ APR_DECLARE(void) apr_terminate2(void);
 /** @} */
 
 /**
- * @defgroup apr_random Random Functions
+ * @defgroup apr_random PRNG Functions
  * @{
  */