GHA: spellcheck curl symbols better

This now makes sure to trim off exact matches for curl symbols and long curl commanad line options instead of using pattern matching as before. This should catch typoed names (that still follow the pattern) better. The cleanspell.pl script is no longer used. cleancmd.pl is used for all markdown files. Closes #16504
docs: minor edits to please the new spellchecker regime
2025-02-27 13:15:02 +01:00 · 2025-02-27 13:15:02 +01:00
50 changed files with 353 additions and 428 deletions
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@ -19,9 +19,6 @@ concurrency:

 permissions: {}

-env:
-  MAKEFLAGS: -j 5
-
 jobs:
  maketgz-and-verify-in-tree:
    runs-on: ubuntu-latest
@ -58,9 +55,9 @@ jobs:
          tar xvf curl-99.98.97.tar.gz
          pushd curl-99.98.97
          ./configure --prefix=$HOME/temp --without-ssl --without-libpsl
-          make
-          make test-ci
-          make install
+          make -j5
+          make -j5 test-ci
+          make -j5 install
          popd
          # basic check of the installed files
          bash scripts/installcheck.sh $HOME/temp
@ -83,8 +80,8 @@ jobs:
          mkdir build
          pushd build
          ../curl-99.98.97/configure --without-ssl --without-libpsl
-          make
-          make test-ci
+          make -j5
+          make -j5 test-ci
          popd
          rm -rf build
          rm -rf curl-99.98.97
@ -106,9 +103,9 @@ jobs:
          mkdir build
          pushd build
          ../configure --without-ssl --enable-debug "--prefix=${PWD}/pkg" --without-libpsl
-          make
-          make test-ci
-          make install
+          make -j5
+          make -j5 test-ci
+          make -j5 install

  verify-out-of-tree-cmake:
    runs-on: ubuntu-latest
@ -125,7 +122,7 @@ jobs:
          tar xvf curl-99.98.97.tar.gz
          pushd curl-99.98.97
          cmake -B build -DCURL_WERROR=ON -DCURL_USE_LIBPSL=OFF
-          make -C build
+          make -C build -j5

  missing-files:
    runs-on: ubuntu-latest
--- a/.github/workflows/http3-linux.yml
+++ b/.github/workflows/http3-linux.yml
@ -454,7 +454,9 @@ jobs:
          grep -F '#define' bld/lib/curl_config.h | sort || true

      - name: 'test configs'
-        run: grep -H -v '^#' bld/tests/config bld/tests/http/config.ini || true
+        run: |
+          cat bld/tests/config || true
+          cat bld/tests/http/config.ini || true

      - name: 'build'
        run: |
@ -498,6 +500,7 @@ jobs:

      - name: 'run pytest event based'
        env:
+          TFLAGS: '${{ matrix.build.tflags }}'
          CURL_TEST_EVENT: 1
          CURL_CI: github
          PYTEST_ADDOPTS: '--color=yes'
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -304,8 +304,7 @@ jobs:
            libtool autoconf automake pkgconf ninja-build \
            ${{ matrix.build.install_steps != 'skipall' && matrix.build.install_steps != 'skiprun' && 'stunnel4' || '' }} \
            libpsl-dev libbrotli-dev libzstd-dev \
-            ${{ matrix.build.install_packages }} \
-            ${{ contains(matrix.build.install_steps, 'pytest') && 'apache2 apache2-dev libnghttp2-dev vsftpd' || '' }}
+            ${{ matrix.build.install_packages }}
          python3 -m venv $HOME/venv

      - name: 'install prereqs'
@ -320,6 +319,11 @@ jobs:
            ${{ matrix.build.install_packages }}
          python3 -m venv $HOME/venv

+      - name: 'install prereqs for pytest'
+        if: contains(matrix.build.install_steps, 'pytest')
+        run: |
+          sudo apt-get -o Dpkg::Use-Pty=0 install apache2 apache2-dev libnghttp2-dev vsftpd
+
      - name: 'install dependencies'
        if: startsWith(matrix.build.container, 'alpine')
        run: |
@ -612,7 +616,9 @@ jobs:
          grep -F '#define' bld/lib/curl_config.h | sort || true

      - name: 'test configs'
-        run: grep -H -v '^#' bld/tests/config bld/tests/http/config.ini || true
+        run: |
+          cat bld/tests/config || true
+          cat bld/tests/http/config.ini || true

      - name: 'build'
        run: |
@ -688,6 +694,7 @@ jobs:
      - name: 'run pytest'
        if: contains(matrix.build.install_steps, 'pytest')
        env:
+          TFLAGS: '${{ matrix.build.tflags }}'
          CURL_CI: github
          PYTEST_ADDOPTS: '--color=yes'
        run: |
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -47,8 +47,8 @@ permissions: {}
 # newer than the 10.8 required by `CFURLCreateDataAndPropertiesFromResource`.

 env:
-  MAKEFLAGS: -j 4
  LDFLAGS: -w  # suppress 'object file was built for newer macOS version than being linked' warnings
+  MAKEFLAGS: -j 4

 jobs:
  macos:
@ -123,10 +123,9 @@ jobs:
            compiler: clang
            configure: --enable-debug --with-openssl=$(brew --prefix openssl)
            tflags: --test-event
-          - name: 'quictls libssh2 !ldap 10.15'
+          - name: 'OpenSSL libssh2 !ldap 10.15'
            compiler: clang
-            install: quictls
-            configure: --enable-debug --disable-ldap --with-openssl=$(brew --prefix quictls) LDFLAGS="${LDFLAGS} -L$(brew --prefix quictls)/lib"
+            configure: --enable-debug --disable-ldap --with-openssl=$(brew --prefix openssl)
            macos-version-min: '10.15'
          # cmake
          - name: 'OpenSSL gsasl rtmp AppleIDN'
@ -137,9 +136,9 @@ jobs:
            generate: -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DUSE_APPLE_IDN=ON -DCURL_CLANG_TIDY=ON -DCLANG_TIDY=$(brew --prefix llvm)/bin/clang-tidy
            clang-tidy: true
            chkprefill: _chkprefill
-          - name: 'quictls +static libssh +examples'
-            install: quictls libssh
-            generate: -DOPENSSL_ROOT_DIR=$(brew --prefix quictls) -DBUILD_STATIC_LIBS=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON
+          - name: 'OpenSSL +static libssh +examples'
+            install: libssh
+            generate: -DOPENSSL_ROOT_DIR=$(brew --prefix openssl) -DBUILD_STATIC_LIBS=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON
          - name: 'SecureTransport debug'
            generate: -DCURL_USE_SECTRANSP=ON -DENABLE_DEBUG=ON
            macos-version-min: '10.8'
@ -185,12 +184,11 @@ jobs:
        run: |
          echo ${{ matrix.build.generate && 'ninja' || 'automake libtool' }} \
            pkgconf libpsl libssh2 \
-            ${{ !matrix.build.clang-tidy && 'libnghttp2 stunnel' || '' }} \
+            ${{ !matrix.build.clang-tidy && 'nghttp2 stunnel' || '' }} \
            ${{ matrix.build.install }} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
          while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done

      - name: 'brew unlink openssl'
-        if: ${{ contains(matrix.build.install, 'libressl') || contains(matrix.build.install, 'quictls') }}
        run: |
          if test -d $(brew --prefix)/include/openssl; then
            brew unlink openssl
@ -345,7 +343,7 @@ jobs:
        if: ${{ contains(matrix.build.name, '+examples') }}
        run: |
          if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld --verbose --target curl-examples
+            cmake --build bld --target curl-examples --verbose
          else
            make -C bld examples V=1
          fi
--- a/.github/workflows/non-native.yml
+++ b/.github/workflows/non-native.yml
@ -59,21 +59,21 @@ jobs:
            time cmake -B bld -G Ninja \
              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
-              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug \
+              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DCURL_USE_OPENSSL=ON \
              -DCURL_USE_GSSAPI=ON \
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            echo '::group::curl_config.h (raw)'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
            echo '::group::curl_config.h'; grep -F '#define' bld/lib/curl_config.h | sort || true; echo '::endgroup::'
-            time cmake --build bld
+            time cmake --build bld --config Debug
            bld/src/curl --disable --version
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              time cmake --build bld --target testdeps
+              time cmake --build bld --config Debug --target testdeps
              export TFLAGS='-j4'
-              time cmake --build bld --target test-ci
+              time cmake --build bld --config Debug --target test-ci
            fi
            echo '::group::build examples'
-            time cmake --build bld --target curl-examples
+            time cmake --build bld --config Debug --target curl-examples
            echo '::endgroup::'

  openbsd:
@ -100,20 +100,20 @@ jobs:
            time cmake -B bld -G Ninja \
              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
-              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug \
+              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DCURL_USE_OPENSSL=ON \
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            echo '::group::curl_config.h (raw)'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
            echo '::group::curl_config.h'; grep -F '#define' bld/lib/curl_config.h | sort || true; echo '::endgroup::'
-            time cmake --build bld
+            time cmake --build bld --config Debug
            bld/src/curl --disable --version
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              time cmake --build bld --target testdeps
+              time cmake --build bld --config Debug --target testdeps
              export TFLAGS='-j8 ~3017 ~TFTP ~FTP'  # FIXME: TFTP requests executed twice? Related: `curl: (69) TFTP: Access Violation`?
-              time cmake --build bld --target test-ci
+              time cmake --build bld --config Debug --target test-ci
            fi
            echo '::group::build examples'
-            time cmake --build bld --target curl-examples
+            time cmake --build bld --config Debug --target curl-examples
            echo '::endgroup::'

  freebsd:
@ -140,7 +140,6 @@ jobs:
          version: '14.1'
          architecture: ${{ matrix.arch }}
          run: |
-            export MAKEFLAGS=-j3
            # https://ports.freebsd.org/
            time sudo pkg install -y autoconf automake libtool \
              pkgconf brotli openldap26-client libidn2 libnghttp2 stunnel py311-impacket
@ -155,18 +154,18 @@ jobs:
              || { tail -n 1000 config.log; false; }
            echo '::group::curl_config.h (raw)'; cat lib/curl_config.h || true; echo '::endgroup::'
            echo '::group::curl_config.h'; grep -F '#define' lib/curl_config.h | sort || true; echo '::endgroup::'
-            time make install
+            time make -j3 install
            src/curl --disable --version
            desc='${{ matrix.desc }}'
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              time make -C tests
+              time make -j3 -C tests
              if [ "${desc#*!runtests*}" = "${desc}" ]; then
                time make test-ci V=1 TFLAGS='-j4'
              fi
            fi
            if [ "${desc#*!examples*}" = "${desc}" ]; then
              echo '::group::build examples'
-              time make examples
+              time make -j3 examples
              echo '::endgroup::'
            fi

@ -185,25 +184,25 @@ jobs:
              -DCMAKE_C_COMPILER='${{ matrix.compiler }}' \
              -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON \
              -DCURL_WERROR=ON \
-              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug \
+              -DENABLE_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG= \
              -DCURL_USE_OPENSSL=ON \
              -DCURL_USE_GSSAPI=ON \
              ${{ matrix.options }} \
              || { cat bld/CMakeFiles/CMake*.yaml; false; }
            echo '::group::curl_config.h (raw)'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
            echo '::group::curl_config.h'; grep -F '#define' bld/lib/curl_config.h | sort || true; echo '::endgroup::'
-            time cmake --build bld
+            time cmake --build bld --config Debug
            bld/src/curl --disable --version
            desc='${{ matrix.desc }}'
            if [ '${{ matrix.arch }}' = 'x86_64' ]; then  # Slow on emulated CPU
-              time cmake --build bld --target testdeps
+              time cmake --build bld --config Debug --target testdeps
              if [ "${desc#*!runtests*}" = "${desc}" ]; then
-                time cmake --build bld --target test-ci
+                time cmake --build bld --config Debug --target test-ci
              fi
            fi
            if [ "${desc#*!examples*}" = "${desc}" ]; then
              echo '::group::build examples'
-              time cmake --build bld --target curl-examples
+              time cmake --build bld --config Debug --target curl-examples
              echo '::endgroup::'
            fi

@ -224,7 +223,6 @@ jobs:
          run: |
            set -e
            ln -s /usr/bin/gcpp /usr/bin/cpp  # Some tests expect `cpp`, which is named `gcpp` in this env.
-            export MAKEFLAGS=-j3
            time autoreconf -fi
            mkdir bld && cd bld && time ../configure --enable-unity --enable-test-bundles --enable-debug --enable-warnings --enable-werror \
              --prefix="${HOME}"/install \
@ -233,12 +231,12 @@ jobs:
              || { tail -n 1000 config.log; false; }
            echo '::group::curl_config.h (raw)'; cat lib/curl_config.h || true; echo '::endgroup::'
            echo '::group::curl_config.h'; grep -F '#define' lib/curl_config.h | sort || true; echo '::endgroup::'
-            time gmake install
+            time gmake -j3 install
            src/curl --disable --version
-            time gmake -C tests
+            time gmake -j3 -C tests
            time gmake test-ci V=1
            echo '::group::build examples'
-            time gmake examples
+            time gmake -j3 examples
            echo '::endgroup::'

  ios:
@ -246,9 +244,9 @@ jobs:
    runs-on: 'macos-latest'
    timeout-minutes: 10
    env:
-      MAKEFLAGS: -j 4
      DEVELOPER_DIR: "/Applications/Xcode${{ matrix.build.xcode && format('_{0}', matrix.build.xcode) || '' }}.app/Contents/Developer"
      CC: ${{ matrix.build.compiler || 'clang' }}
+      MAKEFLAGS: -j 4
      # renovate: datasource=github-tags depName=libressl-portable/portable versioning=semver registryUrl=https://github.com
      libressl-version: 4.0.0
    strategy:
@ -263,7 +261,6 @@ jobs:
            install_steps: libressl
            # FIXME: Could not make OPENSSL_ROOT_DIR work. CMake seems to prepend sysroot to it.
            generate: >-
-              -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD_BATCH_SIZE=50
              -DOPENSSL_INCLUDE_DIR="$HOME/libressl/include"
              -DOPENSSL_SSL_LIBRARY="$HOME/libressl/lib/libssl.a"
              -DOPENSSL_CRYPTO_LIBRARY="$HOME/libressl/lib/libcrypto.a"
@ -272,7 +269,6 @@ jobs:
          - name: 'libressl'
            install_steps: libressl
            generator: Xcode
-            options: --config Debug
            generate: >-
              -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=OFF
              -DMACOSX_BUNDLE_GUI_IDENTIFIER=se.curl
@ -365,7 +361,7 @@ jobs:
      - name: 'build'
        run: |
          if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld ${{ matrix.build.options }} --parallel 4 --verbose
+            cmake --build bld --verbose
          else
            make -C bld V=1
          fi
@ -376,7 +372,7 @@ jobs:
      - name: 'build tests'
        run: |
          if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld ${{ matrix.build.options }} --parallel 4 --target testdeps --verbose
+            cmake --build bld --target testdeps --verbose
          else
            make -C bld V=1 -C tests
          fi
@ -384,7 +380,7 @@ jobs:
      - name: 'build examples'
        run: |
          if [ -n '${{ matrix.build.generate }}' ]; then
-            cmake --build bld ${{ matrix.build.options }} --parallel 4 --target curl-examples --verbose
+            cmake --build bld --target curl-examples --verbose
          else
            make -C bld examples V=1
          fi
@ -394,9 +390,9 @@ jobs:
    runs-on: 'ubuntu-latest'
    timeout-minutes: 25
    env:
-      MAKEFLAGS: -j 5
      VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite'
      VCPKG_DISABLE_METRICS: '1'
+      MAKEFLAGS: -j 5
    strategy:
      matrix:
        include:
@ -494,7 +490,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --verbose
          else
-            make -C bld V=1
+            make -j5 -C bld V=1
          fi

      - name: 'curl info'
@ -505,7 +501,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target testdeps
          else
-            make -C bld -C tests
+            make -j5 -C bld -C tests
          fi

      - name: 'build examples'
@ -513,7 +509,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target curl-examples
          else
-            make -C bld examples
+            make -j5 -C bld examples
          fi

  amiga:
@ -521,7 +517,6 @@ jobs:
    runs-on: 'ubuntu-latest'
    timeout-minutes: 5
    env:
-      MAKEFLAGS: -j 5
      amissl-version: 5.18
    strategy:
      matrix:
@ -589,9 +584,9 @@ jobs:
      - name: 'build'
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld
+            cmake --build bld --parallel 5
          else
-            make -C bld
+            make -j5 -C bld
          fi

      - name: 'curl info'
@ -601,18 +596,18 @@ jobs:
        if: ${{ matrix.build == 'cmake' }}  # skip for autotools to save time
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target testdeps
+            cmake --build bld --parallel 5 --target testdeps
          else
-            make -C bld -C tests
+            make -j5 -C bld -C tests
          fi

      - name: 'build examples'
        if: ${{ matrix.build == 'cmake' }}  # skip for autotools to save time
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target curl-examples
+            cmake --build bld --parallel 5 --target curl-examples
          else
-            make -C bld examples
+            make -j5 -C bld examples
          fi

  msdos:
@ -620,7 +615,6 @@ jobs:
    runs-on: 'ubuntu-latest'
    timeout-minutes: 5
    env:
-      MAKEFLAGS: -j 5
      toolchain-version: '3.4'
    strategy:
      matrix:
@ -700,7 +694,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld
          else
-            make -C bld
+            make -j5 -C bld
          fi

      - name: 'curl info'
@ -712,7 +706,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target testdeps
          else
-            make -C bld -C tests
+            make -j5 -C bld -C tests
          fi

      - name: 'build examples'
@ -721,5 +715,5 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target curl-examples
          else
-            make -C bld examples
+            make -j5 -C bld examples
          fi
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -44,7 +44,6 @@ jobs:
      run:
        shell: C:\cygwin\bin\bash.exe '{0}'
    env:
-      MAKEFLAGS: -j 5
      SHELLOPTS: 'igncr'
    strategy:
      matrix:
@ -112,9 +111,9 @@ jobs:
        timeout-minutes: 10
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld
+            cmake --build bld --config '${{ matrix.type }}'
          else
-            make -C bld V=1 install
+            make -C bld -j5 V=1 install
          fi

      - name: 'curl version'
@ -131,9 +130,9 @@ jobs:
        timeout-minutes: 15
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target testdeps
+            cmake --build bld --config '${{ matrix.type }}' --target testdeps
          else
-            make -C bld V=1 -C tests
+            make -C bld -j5 V=1 -C tests
          fi

      - name: 'run tests'
@ -146,9 +145,9 @@ jobs:
          fi
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            PATH="$PWD/bld/lib:$PATH"
-            cmake --build bld --target test-ci
+            cmake --build bld --config '${{ matrix.type }}' --target test-ci
          else
-            make -C bld V=1 test-ci
+            make -C bld -j5 V=1 test-ci
          fi

      - name: 'build examples'
@ -156,9 +155,9 @@ jobs:
        timeout-minutes: 5
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target curl-examples
+            cmake --build bld --config '${{ matrix.type }}' --target curl-examples
          else
-            make -C bld V=1 examples
+            make -C bld -j5 V=1 examples
          fi

  msys2:  # both msys and mingw-w64
@ -168,8 +167,6 @@ jobs:
    defaults:
      run:
        shell: msys2 {0}
-    env:
-      MAKEFLAGS: -j 5
    strategy:
      matrix:
        include:
@ -253,6 +250,8 @@ jobs:
              fi
              [ '${{ matrix.sys }}' = 'msys' ] && options+=' -D_CURL_PREFILL=ON'
              [ '${{ matrix.test }}' = 'uwp' ] && options+=' -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0'
+              [ '${{ matrix.type }}' = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG='
+              [ '${{ matrix.type }}' = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE='
              [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
              cmake -B "bld${_chkprefill}" -G Ninja ${options} \
                -DCMAKE_C_FLAGS="${{ matrix.cflags }} ${CFLAGS_CMAKE} ${CPPFLAGS}" \
@ -287,9 +286,9 @@ jobs:
        timeout-minutes: 10
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld
+            cmake --build bld --config '${{ matrix.type }}'
          else
-            make -C bld V=1 install
+            make -C bld -j5 V=1 install
          fi

      - name: 'curl version'
@ -312,9 +311,9 @@ jobs:
        timeout-minutes: 10
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target testdeps
+            cmake --build bld --config '${{ matrix.type }}' --target testdeps
          else
-            make -C bld V=1 -C tests
+            make -C bld -j5 V=1 -C tests
          fi
          if [ '${{ matrix.build }}' != 'cmake' ]; then
            # avoid libtool's .exe wrappers
@ -348,10 +347,10 @@ jobs:
          PATH="$PATH:/c/Program Files (x86)/stunnel/bin"
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            PATH="$PWD/bld/lib:$PATH"
-            cmake --build bld --target test-ci
+            cmake --build bld --config '${{ matrix.type }}' --target test-ci
          else
            PATH="$PWD/bld/lib/.libs:$PATH"
-            make -C bld V=1 test-ci
+            make -C bld -j5 V=1 test-ci
          fi

      - name: 'build examples'
@ -359,9 +358,9 @@ jobs:
        timeout-minutes: 5
        run: |
          if [ '${{ matrix.build }}' = 'cmake' ]; then
-            cmake --build bld --target curl-examples
+            cmake --build bld --config '${{ matrix.type }}' --target curl-examples
          else
-            make -C bld V=1 examples
+            make -C bld -j5 V=1 examples
          fi

  mingw-w64-standalone-downloads:
@ -371,8 +370,6 @@ jobs:
    defaults:
      run:
        shell: C:\msys64\usr\bin\bash.exe {0}
-    env:
-      MAKEFLAGS: -j 5
    strategy:
      matrix:
        include:
@ -431,6 +428,8 @@ jobs:
          PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH"
          for _chkprefill in '' ${{ matrix.chkprefill }}; do
            options=''
+            [ '${{ matrix.type }}' = 'Debug' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG='
+            [ '${{ matrix.type }}' = 'Release' ] && options+=' -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE='
            [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF'
            cmake -B "bld${_chkprefill}" -G 'MSYS Makefiles' ${options} \
              -DCMAKE_C_COMPILER=gcc \
@ -458,7 +457,7 @@ jobs:
        timeout-minutes: 5
        run: |
          PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH"
-          cmake --build bld
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5

      - name: 'curl version'
        timeout-minutes: 1
@ -472,7 +471,7 @@ jobs:
        timeout-minutes: 10
        run: |
          PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH"
-          cmake --build bld --target testdeps
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target testdeps

      - name: 'install test prereqs'
        if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
@ -501,29 +500,27 @@ jobs:
            TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
          fi
          PATH="$PWD/bld/lib:$PATH:/c/Program Files (x86)/stunnel/bin"
-          cmake --build bld --target test-ci
+          cmake --build bld --config '${{ matrix.type }}' --target test-ci

      - name: 'build examples'
        timeout-minutes: 5
        run: |
          PATH="$(cygpath "${USERPROFILE}")/my-cache/${{ matrix.dir }}/bin:/c/msys64/usr/bin:$PATH"
-          cmake --build bld --target curl-examples
+          cmake --build bld --config '${{ matrix.type }}' --parallel 5 --target curl-examples

  linux-cross-mingw-w64:
    name: "linux-mingw, ${{ matrix.build == 'cmake' && 'CM' || 'AM' }} ${{ matrix.compiler }}"
    runs-on: ubuntu-latest
    timeout-minutes: 15
-    env:
-      MAKEFLAGS: -j 5
-      TRIPLET: 'x86_64-w64-mingw32'
    strategy:
      fail-fast: false
      matrix:
        build: [autotools, cmake]
        compiler: [gcc]
+    env:
+      TRIPLET: 'x86_64-w64-mingw32'
    steps:
      - name: 'install packages'
-        timeout-minutes: 5
        run: sudo apt-get -o Dpkg::Use-Pty=0 install mingw-w64 ${{ matrix.build == 'cmake' && 'ninja-build' || '' }}

      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@ -567,7 +564,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld
          else
-            make -C bld
+            make -C bld -j5
          fi

      - name: 'curl info'
@ -579,7 +576,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target testdeps
          else
-            make -C bld -C tests
+            make -C bld -j5 -C tests
          fi

      - name: 'build examples'
@ -587,7 +584,7 @@ jobs:
          if [ '${{ matrix.build }}' = 'cmake' ]; then
            cmake --build bld --target curl-examples
          else
-            make -C bld examples
+            make -C bld -j5 examples
          fi

  wince:
@ -595,8 +592,8 @@ jobs:
    runs-on: 'macos-latest'
    timeout-minutes: 10
    env:
-      MAKEFLAGS: -j 4
      toolchain-version: '0.59.1'
+      MAKEFLAGS: -j 4
    strategy:
      matrix:
        build: [autotools, cmake]
@ -604,7 +601,6 @@ jobs:
    steps:
      - name: 'install packages'
        if: ${{ matrix.build == 'autotools' }}
-        timeout-minutes: 5
        run: |
          echo automake libtool | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
          while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done
@ -618,7 +614,6 @@ jobs:

      - name: 'install compiler (mingw32ce)'
        if: ${{ steps.cache-compiler.outputs.cache-hit != 'true' }}
-        timeout-minutes: 5
        run: |
          cd "${HOME}" || exit 1
          curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 3 --retry-connrefused --proto-redir =https \
@ -907,7 +902,7 @@ jobs:
        if: ${{ matrix.tflags != 'skipall' && matrix.tflags != 'skiprun' }}
        timeout-minutes: 10
        run: |
-          export CURL_DIRSUFFIX='${{ matrix.type }}'
+          export CURL_DIRSUFFIX='${{ matrix.type }}/'
          export TFLAGS='-j8 ~WebSockets ~SCP ~612 ${{ matrix.tflags }}'
          if [[ '${{ matrix.install }}' = *'libssh2[core,zlib]'* ]]; then
            TFLAGS+=' ~SFTP'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -352,12 +352,13 @@ endif()
 if(WIN32)
  option(CURL_STATIC_CRT "Build libcurl with static CRT with MSVC (/MT)" OFF)
  if(CURL_STATIC_CRT AND MSVC)
-    if(BUILD_STATIC_CURL OR NOT BUILD_CURL_EXE)
+    if(BUILD_STATIC_CURL)
      set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
      string(APPEND CMAKE_C_FLAGS_RELEASE " -MT")
      string(APPEND CMAKE_C_FLAGS_DEBUG " -MTd")
    else()
-      message(WARNING "Static CRT requires static or no curl executable.")
+      message(WARNING "Static CRT requires curl executable built with static libcurl "
+        "(BUILD_STATIC_LIBS=ON and BUILD_STATIC_CURL=ON).")
    endif()
  endif()
 endif()
@ -1953,6 +1954,22 @@ endif()

 # Some other minor tests

+if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
+  include(CheckCCompilerFlag)
+  check_c_compiler_flag("-Wno-long-double" HAVE_C_FLAG_Wno_long_double)
+  if(HAVE_C_FLAG_Wno_long_double)
+    # The Mac version of GCC warns about use of long double. Disable it.
+    get_source_file_property(_mprintf_compile_flags "mprintf.c" COMPILE_FLAGS)
+    if(_mprintf_compile_flags)
+      string(APPEND _mprintf_compile_flags " -Wno-long-double")
+    else()
+      set(_mprintf_compile_flags "-Wno-long-double")
+    endif()
+    set_source_files_properties("mprintf.c" PROPERTIES
+      COMPILE_FLAGS ${_mprintf_compile_flags})
+  endif()
+endif()
+
 if(_cmake_try_compile_target_type_save)
  set(CMAKE_TRY_COMPILE_TARGET_TYPE ${_cmake_try_compile_target_type_save})
  unset(_cmake_try_compile_target_type_save)
--- a/appveyor.sh
+++ b/appveyor.sh
@ -36,8 +36,6 @@ esac
 if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2022' ]; then
  openssl_root_win="C:/OpenSSL-v34${openssl_suffix}"
 elif [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2019' ]; then
-  openssl_root_win="C:/OpenSSL-v11${openssl_suffix}"
-elif [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ]; then
  openssl_root_win="C:/OpenSSL${openssl_suffix}"
 else
  openssl_root_win="C:/OpenSSL-v111${openssl_suffix}"
@ -54,20 +52,10 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
    [ -n "${TOOLSET:-}" ] && options+=" -T ${TOOLSET}"
    [ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}"
    [ -n "${CURLDEBUG:-}" ] && options+=" -DENABLE_CURLDEBUG=${CURLDEBUG}"
-    if [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ]; then
-      mkdir "_bld${_chkprefill}"
-      cd "_bld${_chkprefill}"
-      options+=' ..'
-      root='..'
-    else
-      options+=" -B _bld${_chkprefill}"
-      options+=' -DCMAKE_VS_GLOBALS=TrackFileAccess=false'
-      options+=" -DCMAKE_UNITY_BUILD=${UNITY}"
-      root='.'
-    fi
    # shellcheck disable=SC2086
-    time cmake -G "${PRJ_GEN}" ${TARGET} \
-      -DCURL_TEST_BUNDLES=ON \
+    cmake -B "_bld${_chkprefill}" -G "${PRJ_GEN}" ${TARGET} \
+      -DCMAKE_VS_GLOBALS=TrackFileAccess=false \
+      -DCMAKE_UNITY_BUILD="${UNITY}" -DCURL_TEST_BUNDLES=ON \
      -DCURL_WERROR=ON \
      -DBUILD_SHARED_LIBS="${SHARED}" \
      -DCURL_STATIC_CRT=ON \
@ -78,8 +66,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
      -DCURL_USE_OPENSSL="${OPENSSL}" \
      -DCURL_USE_LIBPSL=OFF \
      ${options} \
-      || { cat ${root}/_bld/CMakeFiles/CMake* 2>/dev/null; false; }
-    [ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ] && cd ..
+      || { cat _bld/CMakeFiles/CMake* 2>/dev/null; false; }
  done
  if [ -d _bld_chkprefill ] && ! diff -u _bld/lib/curl_config.h _bld_chkprefill/lib/curl_config.h; then
    cat _bld_chkprefill/CMakeFiles/CMake* 2>/dev/null || true
@ -87,7 +74,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
  fi
  echo 'curl_config.h'; grep -F '#define' _bld/lib/curl_config.h | sort || true
  # shellcheck disable=SC2086
-  if ! time cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-}; then
+  if ! cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-}; then
    if [ "${PRJ_GEN}" = 'Visual Studio 9 2008' ]; then
      find . -name BuildLog.htm -exec dos2unix '{}' +
      find . -name BuildLog.htm -exec cat '{}' +
@ -140,14 +127,14 @@ fi

 if [ "${TFLAGS}" != 'skipall' ] && \
   [ "${BUILD_SYSTEM}" = 'CMake' ]; then
-  time cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target testdeps
+  cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target testdeps
 fi

 # run tests

 if [ "${TFLAGS}" != 'skipall' ] && \
   [ "${TFLAGS}" != 'skiprun' ]; then
-  export CURL_DIRSUFFIX="${PRJ_CFG}"
+  export CURL_DIRSUFFIX="${PRJ_CFG}/"
  if [ -x "$(cygpath "${SYSTEMROOT}/System32/curl.exe")" ]; then
    TFLAGS+=" -ac $(cygpath "${SYSTEMROOT}/System32/curl.exe")"
  elif [ -x "$(cygpath 'C:/msys64/usr/bin/curl.exe')" ]; then
@ -155,12 +142,12 @@ if [ "${TFLAGS}" != 'skipall' ] && \
  fi
  TFLAGS+=' -j0'
  if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
-    time cmake --build _bld --config "${PRJ_CFG}" --target test-ci
+    cmake --build _bld --config "${PRJ_CFG}" --target test-ci
  else
    (
      TFLAGS="-a -p !flaky -r -rm ${TFLAGS}"
      cd _bld/tests
-      time ./runtests.pl
+      ./runtests.pl
    )
  fi
 fi
@ -169,5 +156,5 @@ fi

 if [ "${EXAMPLES}" = 'ON' ] && \
   [ "${BUILD_SYSTEM}" = 'CMake' ]; then
-  time cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target curl-examples
+  cmake --build _bld --config "${PRJ_CFG}" --parallel 2 --target curl-examples
 fi
--- a/appveyor.yml
+++ b/appveyor.yml
@ -61,15 +61,15 @@ environment:
      SCHANNEL: 'ON'
      DEBUG: 'OFF'
      CURLDEBUG: 'ON'
-    - job_name: 'CMake, VS2008, Debug, x86, OpenSSL 1.0.2 + Schannel, Shared, Build-tests & examples'
-      APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013'
+    - job_name: 'CMake, VS2008, Debug, x86, OpenSSL 1.1.1 + Schannel, Shared, Build-tests & examples'
+      APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
      PRJ_GEN: 'Visual Studio 9 2008'
      TARGET: '-A Win32'
      PRJ_CFG: Debug
      OPENSSL: 'ON'
      SCHANNEL: 'ON'
      SHARED: 'ON'
-      EXAMPLES: 'ON'
+      EXAMPLES: 'OFF'
    - job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples'
      APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
      PRJ_GEN: 'Visual Studio 10 2010'
@ -109,7 +109,7 @@ environment:
      OPENSSL: 'ON'
      SHARED: 'ON'
      TFLAGS: 'skipall'
-    - job_name: 'CMake, VS2019, Debug, x64, OpenSSL 1.1.0 + Schannel, Shared, Build-tests'
+    - job_name: 'CMake, VS2019, Debug, x64, OpenSSL 1.0.2 + Schannel, Shared, Build-tests'
      APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2019'
      PRJ_GEN: 'Visual Studio 16 2019'
      TARGET: '-A x64'
--- a/docs/INSTALL-CMAKE.md
+++ b/docs/INSTALL-CMAKE.md
@ -238,7 +238,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
 - `CURL_LIBCURL_VERSIONED_SYMBOLS`:         Enable libcurl versioned symbols. Default: `OFF`
 - `CURL_LIBCURL_VERSIONED_SYMBOLS_PREFIX`:  Override default versioned symbol prefix. Default: `<TLS-BACKEND>_` or `MULTISSL_`
 - `CURL_LTO`:                               Enable compiler Link Time Optimizations. Default: `OFF`
- `CURL_STATIC_CRT`:                        Build libcurl with static CRT with MSVC (`/MT`) (requires static or no curl executable). Default: `OFF`
+- `CURL_STATIC_CRT`:                        Build libcurl with static CRT with MSVC (`/MT`) (requires static curl executable). Default: `OFF`
 - `CURL_TARGET_WINDOWS_VERSION`:            Minimum target Windows version as hex string.
 - `CURL_TEST_BUNDLES`:                      Bundle `libtest` and `unittest` tests into single binaries. Default: `OFF`
 - `CURL_WERROR`:                            Turn compiler warnings into errors. Default: `OFF`
--- a/docs/VULN-DISCLOSURE-POLICY.md
+++ b/docs/VULN-DISCLOSURE-POLICY.md
@ -247,11 +247,11 @@ local system or network, the bar is raised. If a local user wrongfully has
 elevated rights on your system enough to attack curl, they can probably
 already do much worse harm and the problem is not really in curl.

-## Debug & Experiments
+## Experiments

 Vulnerabilities in features which are off by default (in the build) and
-documented as experimental, or exist only in debug mode, are not eligible for a
-reward and we do not consider them security problems.
+documented as experimental, are not eligible for a reward and we do not
+consider them security problems.

 ## URL inconsistencies

--- a/docs/examples/block_ip.c
+++ b/docs/examples/block_ip.c
@ -298,19 +298,14 @@ int main(void)

  filter = (struct connection_filter *)calloc(1, sizeof(*filter));
  if(!filter)
-    return 1;
+    exit(1);

-  if(curl_global_init(CURL_GLOBAL_DEFAULT)) {
-    free(filter);
-    return 1;
-  }
+  if(curl_global_init(CURL_GLOBAL_DEFAULT))
+    exit(1);

  curl = curl_easy_init();
-  if(!curl) {
-    curl_global_cleanup();
-    free(filter);
-    return 1;
-  }
+  if(!curl)
+    exit(1);

  /* Set the target URL */
  curl_easy_setopt(curl, CURLOPT_URL, "http://localhost");
--- a/docs/examples/chkspeed.c
+++ b/docs/examples/chkspeed.c
@ -79,12 +79,12 @@ int main(int argc, char *argv[])
          fprintf(stderr,
                  "\rUsage: %s [-m=1|2|5|10|20|50|100] [-t] [-x] [url]\n",
                  appname);
-          return 1;
+          exit(1);
        case 'v':
        case 'V':
          fprintf(stderr, "\r%s %s - %s\n",
                  appname, CHKSPEED_VERSION, curl_version());
-          return 1;
+          exit(1);
        case 'a':
        case 'A':
          prtall = 1;
--- a/docs/examples/cookie_interface.c
+++ b/docs/examples/cookie_interface.c
@ -34,7 +34,8 @@
 #include <curl/curl.h>
 #include <curl/mprintf.h>

-static int print_cookies(CURL *curl)
+static void
+print_cookies(CURL *curl)
 {
  CURLcode res;
  struct curl_slist *cookies;
@ -46,7 +47,7 @@ static int print_cookies(CURL *curl)
  if(res != CURLE_OK) {
    fprintf(stderr, "Curl curl_easy_getinfo failed: %s\n",
            curl_easy_strerror(res));
-    return 1;
+    exit(1);
  }
  nc = cookies;
  i = 1;
@ -59,8 +60,6 @@ static int print_cookies(CURL *curl)
    printf("(none)\n");
  }
  curl_slist_free_all(cookies);
-
-  return 0;
 }

 int
--- a/docs/examples/ephiperfifo.c
+++ b/docs/examples/ephiperfifo.c
@ -418,22 +418,22 @@ static int init_fifo(GlobalInfo *g)
  struct epoll_event epev;

  fprintf(MSG_OUT, "Creating named pipe \"%s\"\n", fifo);
-  if(lstat(fifo, &st) == 0) {
+  if(lstat (fifo, &st) == 0) {
    if((st.st_mode & S_IFMT) == S_IFREG) {
      errno = EEXIST;
      perror("lstat");
-      return 1;
+      exit(1);
    }
  }
  unlink(fifo);
-  if(mkfifo(fifo, 0600) == -1) {
+  if(mkfifo (fifo, 0600) == -1) {
    perror("mkfifo");
-    return 1;
+    exit(1);
  }
  sockfd = open(fifo, O_RDWR | O_NONBLOCK, 0);
  if(sockfd == -1) {
    perror("open");
-    return 1;
+    exit(1);
  }

  g->fifofd = sockfd;
@ -449,9 +449,9 @@ static int init_fifo(GlobalInfo *g)

 static void clean_fifo(GlobalInfo *g)
 {
-  epoll_ctl(g->epfd, EPOLL_CTL_DEL, g->fifofd, NULL);
-  fclose(g->input);
-  unlink(fifo);
+    epoll_ctl(g->epfd, EPOLL_CTL_DEL, g->fifofd, NULL);
+    fclose(g->input);
+    unlink(fifo);
 }


@ -478,13 +478,13 @@ int main(int argc, char **argv)
  g.epfd = epoll_create1(EPOLL_CLOEXEC);
  if(g.epfd == -1) {
    perror("epoll_create1 failed");
-    return 1;
+    exit(1);
  }

  g.tfd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
  if(g.tfd == -1) {
    perror("timerfd_create failed");
-    return 1;
+    exit(1);
  }

  memset(&its, 0, sizeof(struct itimerspec));
@ -496,8 +496,7 @@ int main(int argc, char **argv)
  ev.data.fd = g.tfd;
  epoll_ctl(g.epfd, EPOLL_CTL_ADD, g.tfd, &ev);

-  if(init_fifo(&g))
-    return 1;
+  init_fifo(&g);
  g.multi = curl_multi_init();

  /* setup the generic multi interface options we want */
@ -522,7 +521,7 @@ int main(int argc, char **argv)
      }
      else {
        perror("epoll_wait");
-        return 1;
+        exit(1);
      }
    }

--- a/docs/examples/evhiperfifo.c
+++ b/docs/examples/evhiperfifo.c
@ -402,22 +402,22 @@ static int init_fifo(GlobalInfo *g)
  curl_socket_t sockfd;

  fprintf(MSG_OUT, "Creating named pipe \"%s\"\n", fifo);
-  if(lstat(fifo, &st) == 0) {
+  if(lstat (fifo, &st) == 0) {
    if((st.st_mode & S_IFMT) == S_IFREG) {
      errno = EEXIST;
      perror("lstat");
-      return 1;
+      exit(1);
    }
  }
  unlink(fifo);
-  if(mkfifo(fifo, 0600) == -1) {
+  if(mkfifo (fifo, 0600) == -1) {
    perror("mkfifo");
-    return 1;
+    exit(1);
  }
  sockfd = open(fifo, O_RDWR | O_NONBLOCK, 0);
  if(sockfd == -1) {
    perror("open");
-    return 1;
+    exit(1);
  }
  g->input = fdopen(sockfd, "r");

@ -436,8 +436,7 @@ int main(int argc, char **argv)
  memset(&g, 0, sizeof(GlobalInfo));
  g.loop = ev_default_loop(0);

-  if(init_fifo(&g))
-    return 1;
+  init_fifo(&g);
  g.multi = curl_multi_init();

  ev_timer_init(&g.timer_event, timer_cb, 0., 0.);
--- a/docs/examples/ghiper.c
+++ b/docs/examples/ghiper.c
@ -392,21 +392,21 @@ int init_fifo(void)
    if((st.st_mode & S_IFMT) == S_IFREG) {
      errno = EEXIST;
      perror("lstat");
-      return CURL_SOCKET_BAD;
+      exit(1);
    }
  }

  unlink(fifo);
-  if(mkfifo(fifo, 0600) == -1) {
+  if(mkfifo (fifo, 0600) == -1) {
    perror("mkfifo");
-    return CURL_SOCKET_BAD;
+    exit(1);
  }

  socket = open(fifo, O_RDWR | O_NONBLOCK, 0);

-  if(socket == CURL_SOCKET_BAD) {
+  if(socket == -1) {
    perror("open");
-    return socket;
+    exit(1);
  }
  MSG_OUT("Now, pipe some URL's into > %s\n", fifo);

@ -421,8 +421,6 @@ int main(void)
  GIOChannel* ch;

  fd = init_fifo();
-  if(fd == CURL_SOCKET_BAD)
-    return 1;
  ch = g_io_channel_unix_new(fd);
  g_io_add_watch(ch, G_IO_IN, fifo_cb, g);
  gmain = g_main_loop_new(NULL, FALSE);
--- a/docs/examples/hiperfifo.c
+++ b/docs/examples/hiperfifo.c
@ -399,22 +399,22 @@ static int init_fifo(GlobalInfo *g)
  curl_socket_t sockfd;

  fprintf(MSG_OUT, "Creating named pipe \"%s\"\n", fifo);
-  if(lstat(fifo, &st) == 0) {
+  if(lstat (fifo, &st) == 0) {
    if((st.st_mode & S_IFMT) == S_IFREG) {
      errno = EEXIST;
      perror("lstat");
-      return 1;
+      exit(1);
    }
  }
  unlink(fifo);
  if(mkfifo (fifo, 0600) == -1) {
    perror("mkfifo");
-    return 1;
+    exit(1);
  }
  sockfd = open(fifo, O_RDWR | O_NONBLOCK, 0);
  if(sockfd == -1) {
    perror("open");
-    return 1;
+    exit(1);
  }
  g->input = fdopen(sockfd, "r");

@ -440,8 +440,7 @@ int main(int argc, char **argv)

  memset(&g, 0, sizeof(GlobalInfo));
  g.evbase = event_base_new();
-  if(init_fifo(&g))
-    return 1;
+  init_fifo(&g);
  g.multi = curl_multi_init();
  evtimer_assign(&g.timer_event, g.evbase, timer_cb, &g);

--- a/docs/examples/htmltitle.cpp
+++ b/docs/examples/htmltitle.cpp
@ -94,7 +94,7 @@ static bool init(CURL *&conn, const char *url)

  if(conn == NULL) {
    fprintf(stderr, "Failed to create CURL connection\n");
-    return false;
+    exit(EXIT_FAILURE);
  }

  code = curl_easy_setopt(conn, CURLOPT_ERRORBUFFER, errorBuffer);
@ -270,7 +270,7 @@ int main(int argc, char *argv[])

  if(argc != 2) {
    fprintf(stderr, "Usage: %s <url>\n", argv[0]);
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
  }

  curl_global_init(CURL_GLOBAL_DEFAULT);
@ -279,7 +279,7 @@ int main(int argc, char *argv[])

  if(!init(conn, argv[1])) {
    fprintf(stderr, "Connection initialization failed\n");
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
  }

  // Retrieve content for the URL
@ -289,7 +289,7 @@ int main(int argc, char *argv[])

  if(code != CURLE_OK) {
    fprintf(stderr, "Failed to get '%s' [%s]\n", argv[1], errorBuffer);
-    return EXIT_FAILURE;
+    exit(EXIT_FAILURE);
  }

  // Parse the (assumed) HTML code
--- a/docs/examples/http2-download.c
+++ b/docs/examples/http2-download.c
@ -142,7 +142,7 @@ int my_trace(CURL *handle, curl_infotype type,
  return 0;
 }

-static int setup(struct transfer *t, int num)
+static void setup(struct transfer *t, int num)
 {
  char filename[128];
  CURL *hnd;
@ -155,7 +155,7 @@ static int setup(struct transfer *t, int num)
  if(!t->out) {
    fprintf(stderr, "error: could not open file %s for writing: %s\n",
            filename, strerror(errno));
-    return 1;
+    exit(1);
  }

  /* write to this file */
@ -179,7 +179,6 @@ static int setup(struct transfer *t, int num)
  /* wait for pipe connection to confirm */
  curl_easy_setopt(hnd, CURLOPT_PIPEWAIT, 1L);
 #endif
-  return 0;
 }

 /*
@ -205,8 +204,7 @@ int main(int argc, char **argv)
  multi_handle = curl_multi_init();

  for(i = 0; i < num_transfers; i++) {
-    if(setup(&trans[i], i))
-      return 1;
+    setup(&trans[i], i);

    /* add the individual transfer */
    curl_multi_add_handle(multi_handle, trans[i].easy);
--- a/docs/examples/http2-upload.c
+++ b/docs/examples/http2-upload.c
@ -200,7 +200,7 @@ static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
  return retcode;
 }

-static int setup(struct input *i, int num, const char *upload)
+static void setup(struct input *i, int num, const char *upload)
 {
  FILE *out;
  char url[256];
@ -209,15 +209,14 @@ static int setup(struct input *i, int num, const char *upload)
  curl_off_t uploadsize;
  CURL *hnd;

-  hnd = i->hnd = NULL;
-
+  hnd = i->hnd = curl_easy_init();
  i->num = num;
  curl_msnprintf(filename, 128, "dl-%d", num);
  out = fopen(filename, "wb");
  if(!out) {
    fprintf(stderr, "error: could not open file %s for writing: %s\n", upload,
            strerror(errno));
-    return 1;
+    exit(1);
  }

  curl_msnprintf(url, 256, "https://localhost:8443/upload-%d", num);
@ -226,8 +225,7 @@ static int setup(struct input *i, int num, const char *upload)
  if(stat(upload, &file_info)) {
    fprintf(stderr, "error: could not stat file %s: %s\n", upload,
            strerror(errno));
-    fclose(out);
-    return 1;
+    exit(1);
  }

  uploadsize = file_info.st_size;
@ -236,12 +234,9 @@ static int setup(struct input *i, int num, const char *upload)
  if(!i->in) {
    fprintf(stderr, "error: could not open file %s for reading: %s\n", upload,
            strerror(errno));
-    fclose(out);
-    return 1;
+    exit(1);
  }

-  hnd = i->hnd = curl_easy_init();
-
  /* write to this file */
  curl_easy_setopt(hnd, CURLOPT_WRITEDATA, out);

@ -274,7 +269,6 @@ static int setup(struct input *i, int num, const char *upload)
  /* wait for pipe connection to confirm */
  curl_easy_setopt(hnd, CURLOPT_PIPEWAIT, 1L);
 #endif
-  return 0;
 }

 /*
@ -307,8 +301,7 @@ int main(int argc, char **argv)
  multi_handle = curl_multi_init();

  for(i = 0; i < num_transfers; i++) {
-    if(setup(&trans[i], i, filename))
-      return 1;
+    setup(&trans[i], i, filename);

    /* add the individual transfer */
    curl_multi_add_handle(multi_handle, trans[i].hnd);
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@ -592,7 +592,7 @@ static void query_completed_cb(void *arg,  /* (struct connectdata *) */
  res->num_pending--;

  if(CURL_ASYNC_SUCCESS == status) {
-    struct Curl_addrinfo *ai = Curl_he2ai(hostent, data->conn->remote_port);
+    struct Curl_addrinfo *ai = Curl_he2ai(hostent, data->state.async.port);
    if(ai) {
      compound_results(res, ai);
    }
@ -774,6 +774,8 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
  if(!res->hostname)
    return NULL;

+  data->state.async.hostname = res->hostname;
+  data->state.async.port = port;
  data->state.async.done = FALSE;   /* not done */
  data->state.async.dns = NULL;     /* clear */

@ -809,7 +811,6 @@ struct Curl_addrinfo *Curl_resolver_getaddrinfo(struct Curl_easy *data,
                     service, &hints, addrinfo_cb, data);
  }
 #else
-  (void)port;

 #ifdef HAVE_CARES_IPV6
  if((data->conn->ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) {
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@ -400,7 +400,7 @@ static void destroy_async_data(struct Curl_easy *data)

    td->init = FALSE;
  }
-
+  Curl_safefree(async->hostname);
 }

 #ifdef USE_HTTPSRR_ARES
@ -414,7 +414,7 @@ static CURLcode resolve_httpsrr(struct Curl_easy *data,
  memset(&async->thdata.hinfo, 0, sizeof(struct Curl_https_rrinfo));
  async->thdata.hinfo.port = -1;
  ares_query_dnsrec(async->thdata.channel,
-                    data->conn->host.name, ARES_CLASS_IN,
+                    async->hostname, ARES_CLASS_IN,
                    ARES_REC_TYPE_HTTPS,
                    Curl_dnsrec_done_cb, data, NULL);

@ -436,6 +436,7 @@ static bool init_resolve_thread(struct Curl_easy *data,
  int err = ENOMEM;
  struct Curl_async *async = &data->state.async;

+  async->port = port;
  async->done = FALSE;
  async->dns = NULL;
  td->thread_hnd = curl_thread_t_null;
@ -446,6 +447,11 @@ static bool init_resolve_thread(struct Curl_easy *data,
    goto errno_exit;
  }

+  free(async->hostname);
+  async->hostname = strdup(hostname);
+  if(!async->hostname)
+    goto err_exit;
+
  /* The thread will set this TRUE when complete. */
  td->tsd.done = FALSE;

--- a/lib/doh.c
+++ b/lib/doh.c
@ -1181,7 +1181,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data,

  if(dohp->probe[DOH_SLOT_IPV4].easy_mid < 0 &&
     dohp->probe[DOH_SLOT_IPV6].easy_mid < 0) {
-    failf(data, "Could not DoH-resolve: %s", dohp->host);
+    failf(data, "Could not DoH-resolve: %s", data->state.async.hostname);
    return CONN_IS_PROXIED(data->conn) ? CURLE_COULDNT_RESOLVE_PROXY :
      CURLE_COULDNT_RESOLVE_HOST;
  }
--- a/lib/hostasyn.c
+++ b/lib/hostasyn.c
@ -76,8 +76,8 @@ CURLcode Curl_addrinfo_callback(struct Curl_easy *data,
        Curl_share_lock(data, CURL_LOCK_DATA_DNS, CURL_LOCK_ACCESS_SINGLE);

      dns = Curl_cache_addr(data, ai,
-                            data->conn->host.dispname, 0,
-                            data->conn->localport, FALSE);
+                            data->state.async.hostname, 0,
+                            data->state.async.port, FALSE);
      if(data->share)
        Curl_share_unlock(data, CURL_LOCK_DATA_DNS);

--- a/lib/hostip.c
+++ b/lib/hostip.c
@ -1480,7 +1480,7 @@ CURLcode Curl_resolver_error(struct Curl_easy *data)
  }

  failf(data, "Could not resolve %s: %s", host_or_proxy,
-        data->conn->host.dispname);
+        data->state.async.hostname);

  return result;
 }
--- a/lib/urldata.h
+++ b/lib/urldata.h
@ -565,12 +565,14 @@ struct hostname {
 #if defined(CURLRES_ASYNCH) || !defined(CURL_DISABLE_DOH)
 #define USE_CURL_ASYNC
 struct Curl_async {
+  char *hostname;
  struct Curl_dns_entry *dns;
 #ifdef CURLRES_ASYNCH
  struct thread_data thdata;
 #endif
  void *resolver; /* resolver state, if it is used in the URL state -
                     ares_channel e.g. */
+  int port;
  BIT(done);  /* set TRUE when the lookup is complete */
 };

--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@ -959,7 +959,7 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf,
        return CURLE_SSL_CONNECT_ERROR;
      }
    }
-    else {
+    else if(ssl_config->key_passwd) {
      const unsigned int supported_key_encryption_algorithms =
        GNUTLS_PKCS_USE_PKCS12_3DES | GNUTLS_PKCS_USE_PKCS12_ARCFOUR |
        GNUTLS_PKCS_USE_PKCS12_RC2_40 | GNUTLS_PKCS_USE_PBES2_3DES |
@ -974,12 +974,22 @@ static CURLcode gtls_client_init(struct Curl_cfilter *cf,
           supported_key_encryption_algorithms);
      if(rc != GNUTLS_E_SUCCESS) {
        failf(data,
-              "error reading X.509 %skey file: %s",
-              ssl_config->key_passwd ? "potentially-encrypted " : "",
+              "error reading X.509 potentially-encrypted key file: %s",
              gnutls_strerror(rc));
        return CURLE_SSL_CONNECT_ERROR;
      }
    }
+    else {
+      if(gnutls_certificate_set_x509_key_file(
+           gtls->shared_creds->creds,
+           config->clientcert,
+           ssl_config->key ? ssl_config->key : config->clientcert,
+           gnutls_do_file_type(ssl_config->cert_type) ) !=
+         GNUTLS_E_SUCCESS) {
+        failf(data, "error reading X.509 key or certificate file");
+        return CURLE_SSL_CONNECT_ERROR;
+      }
+    }
  }

 #ifdef USE_GNUTLS_SRP
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@ -482,7 +482,7 @@ AC_DEFUN([CURL_COMPILER_WORKS_IFELSE], [
        #endif
      ]],[[
        int i = 0;
-        return i;
+        exit(i);
      ]])
    ],[
      tmp_compiler_works="yes"
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@ -1270,12 +1270,11 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
        struct addrinfo hints;
        struct addrinfo *ai = 0;
        int error;
-        int exitcode;

        #ifdef _WIN32
        WSADATA wsa;
        if(WSAStartup(MAKEWORD(2, 2), &wsa))
-          return 2;
+          exit(2);
        #endif

        memset(&hints, 0, sizeof(hints));
@ -1284,15 +1283,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
        hints.ai_socktype = SOCK_STREAM;
        error = getaddrinfo("127.0.0.1", 0, &hints, &ai);
        if(error || !ai)
-          exitcode = 1; /* fail */
-        else {
-          freeaddrinfo(ai);
-          exitcode = 0;
-        }
-        #ifdef _WIN32
-        WSACleanup();
-        #endif
-        return exitcode;
+          exit(1); /* fail */
+        else
+          exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -1890,11 +1883,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GETIFADDRS], [

        error = getifaddrs(&ifa);
        if(error || !ifa)
-          return 1; /* fail */
-        else {
-          freeifaddrs(ifa);
-          return 0;
-        }
+          exit(1); /* fail */
+        else
+          exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -2012,9 +2003,9 @@ AC_DEFUN([CURL_CHECK_FUNC_GMTIME_R], [
        gmt = gmtime_r(&local, &result);
        (void)result;
        if(gmt)
-          return 0;
+          exit(0);
        else
-          return 1;
+          exit(1);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -2143,13 +2134,13 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [
        /* - */
        ipv4ptr = inet_ntop(AF_INET, ipv4a, ipv4res, sizeof(ipv4res));
        if(!ipv4ptr)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(ipv4ptr != ipv4res)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(!ipv4ptr[0])
-          return 1; /* fail */
+          exit(1); /* fail */
        if(memcmp(ipv4res, "192.168.100.1", 13) != 0)
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
        ipv6res[0] = '\0';
        memset(ipv6a, 0, sizeof(ipv6a));
@ -2167,15 +2158,15 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [
        /* - */
        ipv6ptr = inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res));
        if(!ipv6ptr)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(ipv6ptr != ipv6res)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(!ipv6ptr[0])
-          return 1; /* fail */
+          exit(1); /* fail */
        if(memcmp(ipv6res, "fe80::214:4fff:fe0b:76c8", 24) != 0)
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
-        return 0;
+        exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -2295,18 +2286,18 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [
        /* - */
        memset(ipv4a, 1, sizeof(ipv4a));
        if(1 != inet_pton(AF_INET, ipv4src, ipv4a))
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
        if( (ipv4a[0] != 0xc0) ||
            (ipv4a[1] != 0xa8) ||
            (ipv4a[2] != 0x64) ||
            (ipv4a[3] != 0x01) ||
            (ipv4a[4] != 0x01) )
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
        memset(ipv6a, 1, sizeof(ipv6a));
        if(1 != inet_pton(AF_INET6, ipv6src, ipv6a))
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
        if( (ipv6a[0]  != 0xfe) ||
            (ipv6a[1]  != 0x80) ||
@ -2319,7 +2310,7 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [
            (ipv6a[14] != 0x76) ||
            (ipv6a[15] != 0xc8) ||
            (ipv6a[16] != 0x01) )
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
        if( (ipv6a[2]  != 0x0) ||
            (ipv6a[3]  != 0x0) ||
@ -2327,9 +2318,9 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [
            (ipv6a[5]  != 0x0) ||
            (ipv6a[6]  != 0x0) ||
            (ipv6a[7]  != 0x0) )
-          return 1; /* fail */
+          exit(1); /* fail */
        /* - */
-        return 0;
+        exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -3818,11 +3809,11 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [
        buffer[0] = '\0';
        string = strerror_r(EACCES, buffer, sizeof(buffer));
        if(!string)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(!string[0])
-          return 1; /* fail */
+          exit(1); /* fail */
        else
-          return 0;
+          exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
@ -3881,11 +3872,11 @@ AC_DEFUN([CURL_CHECK_FUNC_STRERROR_R], [
        buffer[0] = '\0';
        error = strerror_r(EACCES, buffer, sizeof(buffer));
        if(error)
-          return 1; /* fail */
+          exit(1); /* fail */
        if(buffer[0] == '\0')
-          return 1; /* fail */
+          exit(1); /* fail */
        else
-          return 0;
+          exit(0);
      ]])
    ],[
      AC_MSG_RESULT([yes])
--- a/packages/vms/report_openssl_version.c
+++ b/packages/vms/report_openssl_version.c
@ -48,7 +48,7 @@ int main(int argc, char **argv)

  if(argc < 1) {
    puts("report_openssl_version filename");
-    return 1;
+    exit(1);
  }

  libptr = dlopen(argv[1], 0);
@ -65,7 +65,7 @@ int main(int argc, char **argv)

  if(!ssl_version) {
    puts("Unable to lookup version of OpenSSL");
-    return 1;
+    exit(1);
  }

  version = ssl_version(SSLEAY_VERSION);
@ -91,9 +91,9 @@ int main(int argc, char **argv)

    status = LIB$SET_SYMBOL(&symbol_dsc, &value_dsc, &table_type);
    if(!$VMS_STATUS_SUCCESS(status)) {
-      return status;
+      exit(status);
    }
  }

-  return 0;
+  exit(0);
 }
--- a/tests/data/test488
+++ b/tests/data/test488
@ -36,7 +36,7 @@ http
 Download two URLs provided on stdin
 </name>
 <command>
--output-dir %LOGDIR --url @-
+--url @-
 </command>
 <stdin>
 http://%HOSTIP:%HTTPPORT/a
--- a/tests/globalconfig.pm
+++ b/tests/globalconfig.pm
@ -73,10 +73,7 @@ BEGIN {
        $dev_null
    );
 }
-use pathhelp qw(
-    exe_ext
-    dirsepadd
-);
+use pathhelp qw(exe_ext);
 use Cwd qw(getcwd);
 use testutil qw(
    shell_quote
@ -107,11 +104,11 @@ our $perlcmd=shell_quote($^X);
 our $perl="$perlcmd -I. " . shell_quote("-I$srcdir"); # invoke perl like this
 our $LOGDIR="log";  # root of the log directory; this will be different for
                    # each runner in multiprocess mode
-our $LIBDIR=dirsepadd("./libtest/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
-our $UNITDIR=dirsepadd("./unit/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
-our $SRVDIR=dirsepadd("./server/" . ($ENV{'CURL_DIRSUFFIX'} || ''));
+our $LIBDIR="./libtest/" . ($ENV{'CURL_DIRSUFFIX'} || '');
+our $UNITDIR="./unit/" . ($ENV{'CURL_DIRSUFFIX'} || '');
+our $SRVDIR="./server/" . ($ENV{'CURL_DIRSUFFIX'} || '');
 our $TESTDIR="$srcdir/data";
-our $CURL=dirsepadd("../src/" . ($ENV{'CURL_DIRSUFFIX'} || '')) . "curl".exe_ext('TOOL'); # what curl binary to run on the tests
+our $CURL="../src/" . ($ENV{'CURL_DIRSUFFIX'} || '') . "curl".exe_ext('TOOL'); # what curl binary to run on the tests
 our $VCURL=$CURL;  # what curl binary to use to verify the servers with
                   # VCURL is handy to set to the system one when the one you
                   # just built hangs or crashes and thus prevent verification
--- a/tests/http/CMakeLists.txt
+++ b/tests/http/CMakeLists.txt
@ -34,7 +34,7 @@ if(NOT VSFTPD)
 endif()
 mark_as_advanced(VSFTPD)

-find_program(HTTPD NAMES "/usr/sbin/apache2" "httpd" "apache2")
+find_program(HTTPD "apache2")  # /usr/sbin/apache2
 if(NOT HTTPD)
  set(HTTPD "")
 endif()
--- a/tests/http/clients/h2-pausing.c
+++ b/tests/http/clients/h2-pausing.c
@ -140,6 +140,12 @@ static int debug_cb(CURL *handle, curl_infotype type,
  return 0;
 }

+#define ERR()                                                             \
+  do {                                                                    \
+    fprintf(stderr, "something unexpected went wrong - bailing out!\n");  \
+    exit(2);                                                              \
+  } while(0)
+
 static void usage(const char *msg)
 {
  if(msg)
@ -190,13 +196,6 @@ static size_t cb(char *data, size_t size, size_t nmemb, void *clientp)
          handle->idx, (long)realsize);
  return realsize;
 }
-
-#define ERR()                                                             \
-  do {                                                                    \
-    fprintf(stderr, "something unexpected went wrong - bailing out!\n");  \
-    return 2;                                                             \
-  } while(0)
-
 #endif /* !_MSC_VER */

 int main(int argc, char *argv[])
@ -255,19 +254,19 @@ int main(int argc, char *argv[])
  cu = curl_url();
  if(!cu) {
    fprintf(stderr, "out of memory\n");
-    return 1;
+    exit(1);
  }
  if(curl_url_set(cu, CURLUPART_URL, url, 0)) {
    fprintf(stderr, "not a URL: '%s'\n", url);
-    return 1;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) {
    fprintf(stderr, "could not get host of '%s'\n", url);
-    return 1;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) {
    fprintf(stderr, "could not get port of '%s'\n", url);
-    return 1;
+    exit(1);
  }
  memset(&resolve, 0, sizeof(resolve));
  curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1",
--- a/tests/http/clients/h2-upgrade-extreme.c
+++ b/tests/http/clients/h2-upgrade-extreme.c
@ -138,25 +138,24 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *opaque)
 int main(int argc, char *argv[])
 {
  const char *url;
-  CURLM *multi = NULL;
+  CURLM *multi;
  CURL *easy;
  CURLMcode mc;
  int running_handles = 0, start_count, numfds;
  CURLMsg *msg;
  int msgs_in_queue;
  char range[128];
-  int exitcode = 1;

  if(argc != 2) {
    fprintf(stderr, "%s URL\n", argv[0]);
-    return 2;
+    exit(2);
  }

  url = argv[1];
  multi = curl_multi_init();
  if(!multi) {
    fprintf(stderr, "curl_multi_init failed\n");
-    goto cleanup;
+    exit(1);
  }

  start_count = 200;
@ -165,7 +164,7 @@ int main(int argc, char *argv[])
      easy = curl_easy_init();
      if(!easy) {
        fprintf(stderr, "curl_easy_init failed\n");
-        goto cleanup;
+        exit(1);
      }
      curl_easy_setopt(easy, CURLOPT_VERBOSE, 1L);
      curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, debug_cb);
@ -187,9 +186,8 @@ int main(int argc, char *argv[])
      mc = curl_multi_add_handle(multi, easy);
      if(mc != CURLM_OK) {
        fprintf(stderr, "curl_multi_add_handle: %s\n",
-                curl_multi_strerror(mc));
-        curl_easy_cleanup(easy);
-        goto cleanup;
+               curl_multi_strerror(mc));
+        exit(1);
      }
      --start_count;
    }
@ -197,16 +195,16 @@ int main(int argc, char *argv[])
    mc = curl_multi_perform(multi, &running_handles);
    if(mc != CURLM_OK) {
      fprintf(stderr, "curl_multi_perform: %s\n",
-              curl_multi_strerror(mc));
-      goto cleanup;
+             curl_multi_strerror(mc));
+      exit(1);
    }

    if(running_handles) {
      mc = curl_multi_poll(multi, NULL, 0, 1000000, &numfds);
      if(mc != CURLM_OK) {
        fprintf(stderr, "curl_multi_poll: %s\n",
-                curl_multi_strerror(mc));
-        goto cleanup;
+               curl_multi_strerror(mc));
+        exit(1);
      }
    }

@ -226,12 +224,12 @@ int main(int argc, char *argv[])
        else if(msg->data.result) {
          fprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
                  ": failed with %d\n", xfer_id, msg->data.result);
-          goto cleanup;
+          exit(1);
        }
        else if(status != 206) {
          fprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
                  ": wrong http status %ld (expected 206)\n", xfer_id, status);
-          goto cleanup;
+          exit(1);
        }
        curl_multi_remove_handle(multi, msg->easy_handle);
        curl_easy_cleanup(msg->easy_handle);
@ -246,22 +244,5 @@ int main(int argc, char *argv[])
  } while(running_handles > 0 || start_count);

  fprintf(stderr, "exiting\n");
-  exitcode = EXIT_SUCCESS;
-
-cleanup:
-
-  if(multi) {
-    CURL **list = curl_multi_get_handles(multi);
-    if(list) {
-      int i;
-      for(i = 0; list[i]; i++) {
-        curl_multi_remove_handle(multi, list[i]);
-        curl_easy_cleanup(list[i]);
-      }
-      curl_free(list);
-    }
-    curl_multi_cleanup(multi);
-  }
-
-  return exitcode;
+  exit(EXIT_SUCCESS);
 }
--- a/tests/http/clients/tls-session-reuse.c
+++ b/tests/http/clients/tls-session-reuse.c
@ -136,9 +136,9 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *opaque)
  return size * nmemb;
 }

-static int add_transfer(CURLM *multi, CURLSH *share,
-                        struct curl_slist *resolve,
-                        const char *url, int http_version)
+static void add_transfer(CURLM *multi, CURLSH *share,
+                         struct curl_slist *resolve,
+                         const char *url, int http_version)
 {
  CURL *easy;
  CURLMcode mc;
@ -146,7 +146,7 @@ static int add_transfer(CURLM *multi, CURLSH *share,
  easy = curl_easy_init();
  if(!easy) {
    fprintf(stderr, "curl_easy_init failed\n");
-    return 1;
+    exit(1);
  }
  curl_easy_setopt(easy, CURLOPT_VERBOSE, 1L);
  curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, debug_cb);
@ -167,33 +167,30 @@ static int add_transfer(CURLM *multi, CURLSH *share,
  mc = curl_multi_add_handle(multi, easy);
  if(mc != CURLM_OK) {
    fprintf(stderr, "curl_multi_add_handle: %s\n",
-            curl_multi_strerror(mc));
-    curl_easy_cleanup(easy);
-    return 1;
+           curl_multi_strerror(mc));
+    exit(1);
  }
-  return 0;
 }

 int main(int argc, char *argv[])
 {
  const char *url;
-  CURLM *multi = NULL;
+  CURLM *multi;
  CURLMcode mc;
  int running_handles = 0, numfds;
  CURLMsg *msg;
-  CURLSH *share = NULL;
+  CURLSH *share;
  CURLU *cu;
-  struct curl_slist *resolve = NULL;
+  struct curl_slist resolve;
  char resolve_buf[1024];
  int msgs_in_queue;
  int add_more, waits, ongoing = 0;
-  char *host = NULL, *port = NULL;
+  char *host, *port;
  int http_version = CURL_HTTP_VERSION_1_1;
-  int exitcode = 1;

  if(argc != 3) {
    fprintf(stderr, "%s proto URL\n", argv[0]);
-    return 2;
+    exit(2);
  }

  if(!strcmp("h2", argv[1]))
@ -205,41 +202,41 @@ int main(int argc, char *argv[])
  cu = curl_url();
  if(!cu) {
    fprintf(stderr, "out of memory\n");
-    return 1;
+    exit(1);
  }
  if(curl_url_set(cu, CURLUPART_URL, url, 0)) {
    fprintf(stderr, "not a URL: '%s'\n", url);
-    goto cleanup;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) {
    fprintf(stderr, "could not get host of '%s'\n", url);
-    goto cleanup;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) {
    fprintf(stderr, "could not get port of '%s'\n", url);
-    goto cleanup;
+    exit(1);
  }

+  memset(&resolve, 0, sizeof(resolve));
  curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1",
                 host, port);
-  resolve = curl_slist_append(resolve, resolve_buf);
+  curl_slist_append(&resolve, resolve_buf);

  multi = curl_multi_init();
  if(!multi) {
    fprintf(stderr, "curl_multi_init failed\n");
-    goto cleanup;
+    exit(1);
  }

  share = curl_share_init();
  if(!share) {
    fprintf(stderr, "curl_share_init failed\n");
-    goto cleanup;
+    exit(1);
  }
  curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);


-  if(add_transfer(multi, share, resolve, url, http_version))
-    goto cleanup;
+  add_transfer(multi, share, &resolve, url, http_version);
  ++ongoing;
  add_more = 6;
  waits = 3;
@ -247,16 +244,16 @@ int main(int argc, char *argv[])
    mc = curl_multi_perform(multi, &running_handles);
    if(mc != CURLM_OK) {
      fprintf(stderr, "curl_multi_perform: %s\n",
-              curl_multi_strerror(mc));
-      goto cleanup;
+             curl_multi_strerror(mc));
+      exit(1);
    }

    if(running_handles) {
      mc = curl_multi_poll(multi, NULL, 0, 1000000, &numfds);
      if(mc != CURLM_OK) {
        fprintf(stderr, "curl_multi_poll: %s\n",
-                curl_multi_strerror(mc));
-        goto cleanup;
+               curl_multi_strerror(mc));
+        exit(1);
      }
    }

@ -265,8 +262,7 @@ int main(int argc, char *argv[])
    }
    else {
      while(add_more) {
-        if(add_transfer(multi, share, resolve, url, http_version))
-          goto cleanup;
+        add_transfer(multi, share, &resolve, url, http_version);
        ++ongoing;
        --add_more;
      }
@ -288,12 +284,12 @@ int main(int argc, char *argv[])
        else if(msg->data.result) {
          fprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
                  ": failed with %d\n", xfer_id, msg->data.result);
-          goto cleanup;
+          exit(1);
        }
        else if(status != 200) {
          fprintf(stderr, "transfer #%" CURL_FORMAT_CURL_OFF_T
                  ": wrong http status %ld (expected 200)\n", xfer_id, status);
-          goto cleanup;
+          exit(1);
        }
        curl_multi_remove_handle(multi, msg->easy_handle);
        curl_easy_cleanup(msg->easy_handle);
@ -309,27 +305,5 @@ int main(int argc, char *argv[])
  } while(ongoing || add_more);

  fprintf(stderr, "exiting\n");
-  exitcode = EXIT_SUCCESS;
-
-cleanup:
-
-  if(multi) {
-    CURL **list = curl_multi_get_handles(multi);
-    if(list) {
-      int i;
-      for(i = 0; list[i]; i++) {
-        curl_multi_remove_handle(multi, list[i]);
-        curl_easy_cleanup(list[i]);
-      }
-      curl_free(list);
-    }
-    curl_multi_cleanup(multi);
-  }
-  curl_share_cleanup(share);
-  curl_slist_free_all(resolve);
-  curl_free(host);
-  curl_free(port);
-  curl_url_cleanup(cu);
-
-  return exitcode;
+  exit(EXIT_SUCCESS);
 }
--- a/tests/http/clients/upload-pausing.c
+++ b/tests/http/clients/upload-pausing.c
@ -180,6 +180,12 @@ static int progress_callback(void *clientp,
  return 0;
 }

+#define ERR()                                                             \
+  do {                                                                    \
+    fprintf(stderr, "something unexpected went wrong - bailing out!\n");  \
+    exit(2);                                                              \
+  } while(0)
+
 static void usage(const char *msg)
 {
  if(msg)
@ -190,13 +196,6 @@ static void usage(const char *msg)
    "  -V http_version (http/1.1, h2, h3) http version to use\n"
  );
 }
-
-#define ERR()                                                             \
-  do {                                                                    \
-    fprintf(stderr, "something unexpected went wrong - bailing out!\n");  \
-    return 2;                                                             \
-  } while(0)
-
 #endif /* !_MSC_VER */

 int main(int argc, char *argv[])
@ -246,19 +245,19 @@ int main(int argc, char *argv[])
  cu = curl_url();
  if(!cu) {
    fprintf(stderr, "out of memory\n");
-    return 1;
+    exit(1);
  }
  if(curl_url_set(cu, CURLUPART_URL, url, 0)) {
    fprintf(stderr, "not a URL: '%s'\n", url);
-    return 1;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) {
    fprintf(stderr, "could not get host of '%s'\n", url);
-    return 1;
+    exit(1);
  }
  if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) {
    fprintf(stderr, "could not get port of '%s'\n", url);
-    return 1;
+    exit(1);
  }
  memset(&resolve, 0, sizeof(resolve));
  curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1",
@ -268,7 +267,7 @@ int main(int argc, char *argv[])
  curl = curl_easy_init();
  if(!curl) {
    fprintf(stderr, "out of memory\n");
-    return 1;
+    exit(1);
  }
  /* We want to use our own read function. */
  curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@ -21,7 +21,7 @@
 * SPDX-License-Identifier: curl
 *
 ***************************************************************************/
-/* used for test case 533, 534, 535 and 546 */
+/* used for test case 533, 534 and 535 */

 #include "test.h"

--- a/tests/pathhelp.pm
+++ b/tests/pathhelp.pm
@ -59,7 +59,6 @@ BEGIN {
    our @EXPORT_OK = qw(
        os_is_win
        exe_ext
-        dirsepadd
        sys_native_abs_path
        sys_native_current_path
        build_sys_abs_path
@ -183,13 +182,4 @@ sub exe_ext {
    return '';
 }

-#***************************************************************************
-# Add ending slash if missing
-#
-sub dirsepadd {
-    my ($dir) = @_;
-    $dir =~ s/\/$//;
-    return $dir . '/';
-}
-
 1;    # End of module
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@ -1018,8 +1018,8 @@ int main(int argc, char *argv[])
            logdir, SERVERLOGS_LOCKDIR, ipv_inuse);

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  CURL_SET_BINMODE(stdin);
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@ -99,8 +99,8 @@ int main(int argc, char *argv[])
  }

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

 #if defined(CURLRES_IPV6)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@ -1145,8 +1145,8 @@ int main(int argc, char *argv[])
            logdir, SERVERLOGS_LOCKDIR, ipv_inuse);

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  install_signal_handlers(false);
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@ -1507,8 +1507,8 @@ int main(int argc, char *argv[])
  }

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  CURL_SET_BINMODE(stdin);
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@ -1086,8 +1086,8 @@ int main(int argc, char *argv[])
  }

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  CURL_SET_BINMODE(stdin);
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@ -1611,7 +1611,7 @@ static void http_connect(curl_socket_t *infdp,
          if(!req2) {
            req2 = malloc(sizeof(*req2));
            if(!req2)
-              goto http_connect_cleanup;  /* fail */
+              exit(1);
          }
          memset(req2, 0, sizeof(*req2));
          logmsg("====> Client connect DATA");
@ -2207,8 +2207,8 @@ int main(int argc, char *argv[])
            is_proxy ? "-proxy" : "", socket_type);

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  install_signal_handlers(false);
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@ -644,8 +644,8 @@ int main(int argc, char **argv)
            logdir, SERVERLOGS_LOCKDIR, ipv_inuse);

 #ifdef _WIN32
-  if(win32_init())
-    return 2;
+  win32_init();
+  atexit(win32_cleanup);
 #endif

  install_signal_handlers(true);
--- a/tests/server/util.c
+++ b/tests/server/util.c
@ -153,17 +153,7 @@ void win32_perror(const char *msg)
  fprintf(stderr, "%s\n", buf);
 }

-static void win32_cleanup(void)
-{
-#ifdef USE_WINSOCK
-  WSACleanup();
-#endif  /* USE_WINSOCK */
-
-  /* flush buffers of all streams regardless of their mode */
-  _flushall();
-}
-
-int win32_init(void)
+void win32_init(void)
 {
 #ifdef USE_WINSOCK
  WORD wVersionRequested;
@ -176,7 +166,7 @@ int win32_init(void)
  if(err) {
    perror("Winsock init failed");
    logmsg("Error initialising Winsock -- aborting");
-    return 1;
+    exit(1);
  }

  if(LOBYTE(wsaData.wVersion) != LOBYTE(wVersionRequested) ||
@ -184,11 +174,19 @@ int win32_init(void)
    WSACleanup();
    perror("Winsock init failed");
    logmsg("No suitable winsock.dll found -- aborting");
-    return 1;
+    exit(1);
  }
 #endif  /* USE_WINSOCK */
-  atexit(win32_cleanup);
-  return 0;
+}
+
+void win32_cleanup(void)
+{
+#ifdef USE_WINSOCK
+  WSACleanup();
+#endif  /* USE_WINSOCK */
+
+  /* flush buffers of all streams regardless of their mode */
+  _flushall();
 }

 /* socket-safe strerror (works on Winsock errors, too) */
--- a/tests/server/util.h
+++ b/tests/server/util.h
@ -51,7 +51,8 @@ extern const char *cmdfile;
 #define perror(m) win32_perror(m)
 void win32_perror(const char *msg);

-int win32_init(void);
+void win32_init(void);
+void win32_cleanup(void);
 const char *sstrerror(int err);
 #else   /* _WIN32 */

--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@ -58,11 +58,9 @@ CFGSET=true
 !ENDIF

 !INCLUDE "../lib/Makefile.inc"
-CSOURCES=$(CSOURCES:  = )
 LIBCURL_OBJS=$(CSOURCES:.c=.obj)

 !INCLUDE "../src/Makefile.inc"
-CURL_CFILES=$(CURL_CFILES:  = )
 CURL_OBJS=$(CURL_CFILES:.c=.obj)