[pull] master from curl:master

.circleci/config.yml

@@ -52,7 +52,7 @@ commands:
       - run:
           command: |
             # renovate: datasource=github-tags depName=wolfSSL/wolfssl versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
-            WOLFSSL_VER=5.6.0
+            WOLFSSL_VER=5.7.4
             echo "Installing wolfSSL $WOLFSSL_VER"
             curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssl/archive/v$WOLFSSL_VER-stable.tar.gz
             tar -xzf v$WOLFSSL_VER-stable.tar.gz
@@ -66,7 +66,7 @@ commands:
       - run:
           command: |
             # renovate: datasource=github-tags depName=wolfSSL/wolfssh versioning=semver extractVersion=^v?(?<version>.+)-stable$ registryUrl=https://github.com
-            WOLFSSH_VER=1.4.12
+            WOLFSSH_VER=1.4.19
             echo "Installing wolfSSH $WOLFSSH_VER"
             curl -LOsSf --retry 6 --retry-connrefused --max-time 999 https://github.com/wolfSSL/wolfssh/archive/v$WOLFSSH_VER-stable.tar.gz
             tar -xzf v$WOLFSSH_VER-stable.tar.gz

.github/CONTRIBUTING.md

@@ -26,4 +26,4 @@ Send your suggestions using one of these methods:
 
  3. as an [issue](https://github.com/curl/curl/issues)
 
-/ The curl team!
+/ The curl team

.github/scripts/badwords.txt

@@ -65,3 +65,4 @@ couldn't:could not
 64 bit\b=64-bit
 64-bits:64 bits or 64-bit
 32-bits:32 bits or 32-bit
+\bvery\b:rephrase using an alternative word

.github/scripts/cmp-config.pl

@@ -48,6 +48,7 @@
     '#define HAVE_DECL_GETPWUID_R_MISSING 1' => 1,
     '#define HAVE_DLFCN_H 1' => 1,
     '#define HAVE_GETHOSTBYNAME 1' => 1,
+    '#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1,
     '#define HAVE_INTTYPES_H 1' => 1,
     '#define HAVE_IOCTL 1' => 1,
     '#define HAVE_LDAP_H 1' => 1,
@@ -75,8 +76,8 @@
     '#define HAVE_ZSTD_H 1' => 1,
     '#define LT_OBJDIR ".libs/"' => 1,
     '#define NEED_LBER_H 1' => 1,
-    '#define OS "Linux"' => 1,
-    '#define OS "x86_64-pc-linux-gnu"' => 1,
+    '#define CURL_OS "Linux"' => 1,
+    '#define CURL_OS "x86_64-pc-linux-gnu"' => 1,
     '#define PACKAGE "curl"' => 1,
     '#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"' => 1,
     '#define PACKAGE_NAME "curl"' => 1,

.github/scripts/spellcheck.words

@@ -364,7 +364,7 @@ ifdefs
 ifhost
 IIS
 ILE
-Illumos
+illumos
 IMAP
 imap
 IMAPS
@@ -688,7 +688,6 @@ RETR
 retransmit
 retrigger
 RHEL
-RICS
 Rikard
 rmdir
 ROADMAP
@@ -702,6 +701,7 @@ RRtype
 RSA
 RTMP
 rtmp
+rtmpdump
 RTMPE
 RTMPS
 RTMPT
@@ -768,6 +768,7 @@ SOCKOPT
 SOCKSv
 Solaris
 SONAME
+SOVERSION
 Soref
 SPARC
 SPDX

.github/workflows/checkdocs.yml

@@ -33,59 +33,63 @@ concurrency:
 permissions: {}
 
 jobs:
-  proselint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
-        name: checkout
-
-      - name: install prereqs
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get install python3-proselint
-
-      # config file help: https://github.com/amperser/proselint/
-      - name: create proselint config
-        run: |
-          cat <<JSON > $HOME/.proselintrc
-          {
-            "checks": {
-              "typography.diacritical_marks": false,
-              "typography.symbols": false,
-              "annotations.misc": false,
-              "security.password": false
-            }
-          }
-          JSON
-
-      - name: trim headers off all *.md files
-        run: git ls-files -z '*.md' | xargs -0 -n1 .github/scripts/trimmarkdownheader.pl
-
-      - name: check prose
-        run: git ls-files -z '*.md' | grep -Evz 'CHECKSRC.md|DISTROS.md|CURLOPT_INTERFACE.md|interface.md' | xargs -0 proselint README
-
-      # This is for CHECKSRC and files with aggressive exclamation mark needs
-      - name: create second proselint config
-        run: |
-          cat <<JSON > $HOME/.proselintrc
-          {
-            "checks": {
-              "typography.diacritical_marks": false,
-              "typography.symbols": false,
-              "typography.exclamation": false,
-              "annotations.misc": false
-            }
-          }
-          JSON
-
-      - name: check special prose
-        run: proselint docs/CHECKSRC.md docs/libcurl/opts/CURLOPT_INTERFACE.md docs/cmdline-opts/interface.md
+  #  proselint:
+  #    runs-on: ubuntu-latest
+  #    steps:
+  #      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+  #        name: checkout
+  #
+  #      - name: install prereqs
+  #        run: |
+  #          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+  #          sudo apt-get update -y
+  #          sudo apt-get install -y --no-install-suggests --no-install-recommends \
+  #            python3-proselint
+  #
+  #      # config file help: https://github.com/amperser/proselint/
+  #      - name: create proselint config
+  #        run: |
+  #          cat <<JSON > $HOME/.proselintrc.json
+  #          {
+  #            "checks": {
+  #              "typography.diacritical_marks": false,
+  #              "typography.symbols": false,
+  #              "annotations.misc": false,
+  #              "security.password": false,
+  #              "misc.annotations": false
+  #            }
+  #          }
+  #          JSON
+  #
+  #      - name: trim headers off all *.md files
+  #        run: git ls-files -z '*.md' | xargs -0 -n1 .github/scripts/trimmarkdownheader.pl
+  #
+  #      - name: check prose
+  #        run: git ls-files -z '*.md' | grep -Evz 'CHECKSRC.md|DISTROS.md|curl_mprintf.md|CURLOPT_INTERFACE.md|interface.md' | xargs -0 proselint README
+  #
+  #      # This is for CHECKSRC and files with aggressive exclamation mark needs
+  #      - name: create second proselint config
+  #        run: |
+  #          cat <<JSON > $HOME/.proselintrc.json
+  #          {
+  #            "checks": {
+  #              "typography.diacritical_marks": false,
+  #              "typography.symbols": false,
+  #              "typography.exclamation": false,
+  #              "lexical_illusions.misc": false,
+  #              "annotations.misc": false
+  #            }
+  #          }
+  #          JSON
+  #
+  #      - name: check special prose
+  #        run: proselint docs/internals/CHECKSRC.md docs/libcurl/curl_mprintf.md docs/libcurl/opts/CURLOPT_INTERFACE.md docs/cmdline-opts/interface.md
 
   # Docs: https://github.com/marketplace/actions/markdown-link-check
   linkcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: trim the cmdline docs markdown files
@@ -98,7 +102,7 @@ jobs:
   spellcheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: trim all man page *.md files
@@ -117,14 +121,14 @@ jobs:
         run: grep -v '^#' .github/scripts/spellcheck.words >  wordlist.txt
 
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@b83ca7c1b5c285e4f2b43e209a455c74872ec341 # v0
+        uses: rojopolis/spellcheck-github-actions@403efe0642148e94ecb3515e89c767b85a32371a # v0
         with:
           config_path: .github/scripts/spellcheck.yaml
 
   badwords-synopsis:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: badwords
@@ -136,11 +140,21 @@ jobs:
   man-examples:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: render nroff versions
         run: autoreconf -fi && ./configure --without-ssl --without-libpsl && make -C docs
 
       - name: verify examples
         run: .github/scripts/verify-examples.pl docs/libcurl/curl*.3 docs/libcurl/opts/*.3
+
+  miscchecks:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        name: checkout
+
+      - name: spacecheck
+        run: .github/scripts/spacecheck.pl

.github/workflows/checksrc.yml

@@ -35,22 +35,30 @@ jobs:
   checksrc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: check
         run: git ls-files -z "*.[ch]" | xargs -0 -n1 ./scripts/checksrc.pl
 
-  codespell-cmakelint:
-    runs-on: ubuntu-latest
+  codespell-cmakelint-pytype-ruff:
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: install
+        env:
+          DEBIAN_FRONTEND: noninteractive
         run: |
-          sudo apt-get install codespell python3-pip
-          python3 -m pip install cmakelint==1.4.3
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -y
+          sudo apt-get install -y --no-install-suggests --no-install-recommends \
+            codespell python3-pip python3-networkx python3-pydot python3-yaml \
+            python3-toml python3-markupsafe python3-jinja2 python3-tabulate \
+            python3-typing-extensions python3-libcst python3-impacket \
+            python3-websockets python3-pytest
+          python3 -m pip install --break-system-packages cmakelint==1.4.3 pytype==2024.9.13 ruff==0.6.8
 
       - name: spellcheck
         run: |
@@ -63,20 +71,26 @@ jobs:
       - name: cmakelint
         run: scripts/cmakelint.sh
 
+      - name: pytype
+        run: find . -name '*.py' -exec pytype -j auto -k {} +
+
+      - name: ruff
+        run: ruff check --extend-select=B007,B016,C405,C416,COM818,D200,D213,D204,D401,D415,FURB129,N818,PERF401,PERF403,PIE790,PIE808,PLW0127,Q004,RUF010,SIM101,SIM117,SIM118,TRY400,TRY401
+
   reuse:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: REUSE Compliance Check
-        uses: fsfe/reuse-action@3ae3c6bdf1257ab19397fab11fd3312144692083 # v4
+        uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5
 
   miscchecks:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: checkout
 
       - name: shellcheck

.github/workflows/codeql-analysis.yml

@@ -47,19 +47,19 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
+        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3
         with:
           languages: cpp
           queries: security-extended
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
+        uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
       #    make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
+        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3

.github/workflows/configure-vs-cmake.yml

@@ -32,7 +32,7 @@ jobs:
   check-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: run configure --with-openssl
         run: |
@@ -70,7 +70,7 @@ jobs:
         run: |
          echo '::group::brew packages installed'; ls -l "$(brew --prefix)/opt"; echo '::endgroup::'
 
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: run configure --with-openssl
         run: |
@@ -107,7 +107,7 @@ jobs:
       - name: install packages
         run: sudo apt-get --quiet 2 --option Dpkg::Use-Pty=0 install mingw-w64
 
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: run configure --with-schannel
         run: |