merge changed till curl 8.20

.circleci/config.yml

@@ -28,30 +28,6 @@
 version: 2.1
 
 commands:
-  configure:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            ./configure --enable-warnings --enable-werror --with-openssl \
-              || { tail -1000 config.log; false; }
-
-  configure-openssl-no-verbose:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            ./configure --disable-verbose --enable-werror --with-openssl \
-              || { tail -1000 config.log; false; }
-
-  configure-no-proxy:
-    steps:
-      - run:
-          command: |
-            autoreconf -fi
-            ./configure --disable-proxy --enable-werror --with-openssl \
-              || { tail -1000 config.log; false; }
-
   install-cares:
     steps:
       - run:
@@ -62,86 +38,83 @@ commands:
     steps:
       - run:
           command: |
+            export DEBIAN_FRONTEND=noninteractive
             sudo apt-get update && sudo apt-get install -y libssh-dev
 
   install-deps:
     steps:
       - run:
           command: |
-            sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev python3-pip libpsl-dev
-            sudo python3 -m pip install impacket
+            sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev python3-pip
+            python3 -m venv ~/venv
+            ~/venv/bin/pip --disable-pip-version-check --no-input --no-cache-dir install --progress-bar off --prefer-binary -r tests/requirements.txt
 
-  configure-libssh:
+  configure:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --enable-warnings --enable-werror --with-openssl --with-libssh \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
+              --with-openssl \
               || { tail -1000 config.log; false; }
 
-  install-wolfssl:
-    steps:
-      - run:
-          command: |
-            source .github/scripts/VERSIONS
-            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
-            cd wolfssl-$WOLFSSL_VER-stable
-            ./autogen.sh
-            ./configure --enable-tls13 --enable-all --enable-harden --prefix=$HOME/wssl
-            make install
-
-  install-wolfssh:
+  configure-no-proxy:
     steps:
       - run:
           command: |
-            source .github/scripts/VERSIONS
-            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
-            cd wolfssh-$WOLFSSH_VER-stable
-            ./autogen.sh
-            ./configure --with-wolfssl=$HOME/wssl --prefix=$HOME/wssh --enable-scp --enable-sftp --disable-examples
-            make install
+            autoreconf -fi
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror \
+              --with-openssl --disable-proxy \
+              || { tail -1000 config.log; false; }
 
-  configure-cares:
+  configure-libssh:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --enable-warnings --enable-werror --with-openssl --enable-ares \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
+              --with-openssl --with-libssh \
               || { tail -1000 config.log; false; }
 
-  configure-wolfssh:
+  configure-cares:
     steps:
       - run:
           command: |
             autoreconf -fi
-            LDFLAGS="-Wl,-rpath,$HOME/wssh/lib" ./configure --enable-warnings --enable-werror --with-wolfssl=$HOME/wssl --with-wolfssh=$HOME/wssh \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-warnings \
+              --with-openssl --enable-ares \
               || { tail -1000 config.log; false; }
 
   configure-cares-debug:
     steps:
       - run:
           command: |
             autoreconf -fi
-            ./configure --enable-debug --enable-werror --with-openssl --enable-ares \
+            ./configure --disable-dependency-tracking --enable-option-checking=fatal --enable-unity --enable-werror --enable-debug \
+              --with-openssl --enable-ares \
               || { tail -1000 config.log; false; }
 
   build:
     steps:
       - run: make -j3 V=1
+      - run: src/curl --disable --version
       - run: make -j3 V=1 examples
 
   test:
     steps:
-      - run: make -j3 V=1 test-ci TFLAGS='-j14'
+      - run:
+          command: |
+            source ~/venv/bin/activate
+            # Revert a CircleCI-specific local setting that makes test 1459
+            # return 67 (CURLE_LOGIN_DENIED) instead of the
+            # expected 60 (CURLE_PEER_FAILED_VERIFICATION).
+            echo 'StrictHostKeyChecking yes' >> ~/.ssh/config
+            make -j3 V=1 test-ci TFLAGS='-j14'
 
 executors:
   ubuntu:
     machine:
-      image: ubuntu-2004:2024.01.1
+      image: ubuntu-2204:2025.09.1
 
 jobs:
   basic:
@@ -153,24 +126,6 @@ jobs:
       - build
       - test
 
-  no-verbose:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - configure-openssl-no-verbose
-      - build
-
-  wolfssh:
-    executor: ubuntu
-    steps:
-      - checkout
-      - install-deps
-      - install-wolfssl
-      - install-wolfssh
-      - configure-wolfssh
-      - build
-
   no-proxy:
     executor: ubuntu
     steps:
@@ -202,7 +157,7 @@ jobs:
 
   arm:
     machine:
-      image: ubuntu-2004:2024.01.1
+      image: ubuntu-2204:2025.09.1
     resource_class: arm.medium
     steps:
       - checkout
@@ -213,7 +168,7 @@ jobs:
 
   arm-cares:
     machine:
-      image: ubuntu-2004:2024.01.1
+      image: ubuntu-2204:2025.09.1
     resource_class: arm.medium
     steps:
       - checkout
@@ -240,14 +195,6 @@ workflows:
     jobs:
       - no-proxy
 
-  openssl-no-verbose:
-    jobs:
-      - no-verbose
-
-  wolfssl-wolfssh:
-    jobs:
-      - wolfssh
-
   arm-openssl:
     jobs:
       - arm

.clang-tidy.yml

@@ -0,0 +1,59 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+---
+# https://clang.llvm.org/extra/clang-tidy/
+
+# https://clang.llvm.org/extra/clang-tidy/checks/list.html
+Checks:
+  - clang-analyzer-*
+  - -clang-analyzer-optin.performance.Padding
+  - -clang-analyzer-security.ArrayBound  # due to false positives with clang-tidy v21.1.0+
+  - -clang-analyzer-security.insecureAPI.bzero  # for FD_ZERO() (seen on macOS)
+  - -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling
+  - -clang-diagnostic-nullability-extension
+  - bugprone-assert-side-effect
+  - bugprone-assignment-in-if-condition
+  - bugprone-chained-comparison
+  - bugprone-dynamic-static-initializers
+  - bugprone-invalid-enum-default-initialization
+  - bugprone-macro-parentheses
+  - bugprone-macro-repeated-side-effects
+  - bugprone-misplaced-operator-in-strlen-in-alloc
+  - bugprone-misplaced-pointer-arithmetic-in-alloc
+  - bugprone-not-null-terminated-result
+  - bugprone-posix-return
+  - bugprone-redundant-branch-condition
+  - bugprone-signed-char-misuse
+  - bugprone-sizeof-expression
+  - bugprone-suspicious-enum-usage
+  - bugprone-suspicious-memset-usage
+  - bugprone-suspicious-missing-comma
+  - bugprone-suspicious-realloc-usage
+  - bugprone-suspicious-semicolon
+  # bugprone-unchecked-string-to-number-conversion  # needs converting sscanf to strtol or curlx_str_*
+  - misc-const-correctness
+  - misc-header-include-cycle
+  # misc-redundant-expression  # undesired hits due to system macros, e.g. due to POLLIN == POLLRDNORM | POLLRDBAND, then or-ing all three
+  - portability-*
+  - readability-duplicate-include
+  # readability-else-after-return
+  # readability-enum-initial-value
+  # readability-function-cognitive-complexity
+  - readability-inconsistent-declaration-parameter-name
+  # readability-misleading-indentation  # too many false positives and oddball/conditional source
+  - readability-named-parameter
+  # readability-redundant-casting  # false positives in types that change from platform to platform, even with IgnoreTypeAliases: true
+  - readability-redundant-control-flow
+  - readability-redundant-declaration
+  - readability-redundant-function-ptr-dereference
+  - readability-redundant-parentheses
+  - readability-redundant-preprocessor
+  - readability-suspicious-call-argument
+  - readability-uppercase-literal-suffix
+
+CheckOptions:
+  misc-header-include-cycle.IgnoredFilesList: 'curl/curl.h'
+  readability-inconsistent-declaration-parameter-name.Strict: true
+
+HeaderFilterRegex: '.*'  # Default in v22.1.0+

.editorconfig

@@ -0,0 +1,18 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.{c,h}]
+indent_size = 2
+max_line_length = 79
+
+[*.{pl,pm}]
+indent_size = 4

.gitattributes

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: curl
 
-buildconf eol=lf
 configure.ac eol=lf
 *.m4 eol=lf
 *.in eol=lf

.github/CONTRIBUTING.md

@@ -4,26 +4,19 @@ Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
 SPDX-License-Identifier: curl
 -->
 
-How to contribute to curl
-=========================
+# How to contribute to curl
 
-Join the community
-------------------
+## Join the community
 
- 1. Click 'watch' on the GitHub repo
+1. Click 'watch' on the GitHub repo
+2. Subscribe to the suitable [mailing lists](https://curl.se/mail/)
 
- 2. Subscribe to the suitable [mailing lists](https://curl.se/mail/)
+## Read [CONTRIBUTE](/docs/CONTRIBUTE.md)
 
-Read [CONTRIBUTE](../docs/CONTRIBUTE.md)
----------------------------------------
+## Send your suggestions using one of these methods:
 
-Send your suggestions using one of these methods:
--------------------------------------------------
+1. in a mail to the mailing list
+2. as a [pull request](https://github.com/curl/curl/pulls)
+3. as an [issue](https://github.com/curl/curl/issues)
 
- 1. in a mail to the mailing list
-
- 2. as a [pull request](https://github.com/curl/curl/pulls)
-
- 3. as an [issue](https://github.com/curl/curl/issues)
-
-/ The curl team!
+/ The curl team

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -13,12 +13,7 @@ body:
 
         Only file bugs here! Ask questions on the mailing lists https://curl.se/mail/
 
-        **SECURITY RELATED?** Post it here: https://hackerone.com/curl
-
-        There are collections of known issues to be aware of:
-
-        - https://curl.se/docs/knownbugs.html
-        - https://curl.se/docs/todo.html
+        **SECURITY RELATED?** Submit here: https://hackerone.com/curl
 
   - type: textarea
     id: reproducer
@@ -40,7 +35,7 @@ body:
       label: curl/libcurl version
       description: |
         Please paste the output of `curl -V` here.
-      placeholder: 'curl 8.2.0'
+      placeholder: 'curl 8.18.0'
     validations:
       required: true
 

.github/dependabot.yml

@@ -2,9 +2,37 @@
 #
 # SPDX-License-Identifier: curl
 
+# https://docs.github.com/code-security/dependabot/working-with-dependabot/dependabot-options-reference
+
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'
+    cooldown:
+      default-days: 7
+    groups:
+      gha-dependencies:
+        patterns:
+          - '*'
+    commit-message:
+      prefix: 'GHA:'
+
+  - package-ecosystem: 'pip'
+    directories:
+      - '.github/scripts'
+      - 'tests'
     schedule:
-      interval: "weekly"
+      interval: 'monthly'
+    cooldown:
+      default-days: 7
+      semver-major-days: 15
+      semver-minor-days: 7
+      semver-patch-days: 3
+    groups:
+      pip-dependencies:
+        patterns:
+          - '*'
+    commit-message:
+      prefix: 'GHA:'