]> git.ipfire.org Git - thirdparty/curl.git/log
thirdparty/curl.git
7 weeks agocmake/FindGSS: fix comment, adjust custom flavor property name
Viktor Szakats [Mon, 15 Jun 2026 00:14:13 +0000 (02:14 +0200)] 
cmake/FindGSS: fix comment, adjust custom flavor property name

- fix property name in comment.
- rename `INTERFACE_CURL_GSS_FLAVOUR` ->
  `INTERFACE_CURL_GSS_FLAVOR` to match preferred usage.

Follow-up to 8aeefd0b353021053688e53fc3a4b0edef85dcc7 (subcommit)
Follow-up to 16f073ef49f94412000218c9f6ad04e3fd7e4d01 #16973

Closes #22013

7 weeks agotidy-up: miscellaneous
Viktor Szakats [Thu, 11 Jun 2026 22:33:40 +0000 (00:33 +0200)] 
tidy-up: miscellaneous

- `N byte` -> `N-byte` or `N bytes`.
- INTERNALS.md: language tweaks.
- schannel: language tweak in comment/error message.
- socks_gssapi, socks_sspi: simplify composing an error message.
  (at a cost of 8 extra constant string bytes.)
- m4/curl-compilers.m4: fix typo in link (in comment).
- contrithanks.sh: fix indent, drop stray `;` terminator.
- lib, src, tests: drop/fix a bunch of badwords.
- fix typos in comments.
- fix indent, stray spaces.

Some of these spotted by GitHub Code Quality and Copilot

Closes #22009

7 weeks agosocks_sspi: store socks5_gssapi_enctype
Daniel Stenberg [Sun, 14 Jun 2026 10:44:44 +0000 (12:44 +0200)] 
socks_sspi: store socks5_gssapi_enctype

Store the unwrapped protection level in `conn->socks5_gssapi_enctype` to
prevent the proxy from contuning unprotected. Matches the GSSAPI version
of the code.

Reported-by: Trail of Bits
Closes #22004

7 weeks agosmb: integer overflow proof a size check
Daniel Stenberg [Sun, 14 Jun 2026 10:19:49 +0000 (12:19 +0200)] 
smb: integer overflow proof a size check

By using size_t for the vars instead of shorts.

Pointed out by Zeropath

Closes #22001

7 weeks agoservers: drop single-use interim result variables
Viktor Szakats [Sun, 14 Jun 2026 11:51:24 +0000 (13:51 +0200)] 
servers: drop single-use interim result variables

Closes #22008

7 weeks agoservers: minor socket error handling fixes
Viktor Szakats [Sun, 14 Jun 2026 12:36:24 +0000 (14:36 +0200)] 
servers: minor socket error handling fixes

- sws: fix socket error code in `select()` failure message.
  Spotted by Copilot
  Bug: https://github.com/curl/curl/pull/21998#discussion_r3409469444
- sws: do not call `SOCKERRNO` twice on error.
- dnsd: do not call `SOCKERRNO` twice on error.
- dnsd: replace `goto` with `while()` to sync with rest of code.
- dnsd: `sendto()` fail message fixes:
  - replace `int` cast with `%zu` mask.
  - drop redundant newline.
  - show socket error string like rest of code.
  - report not-fully-sent error separately from socket errors.

Closes #22007

7 weeks agortspd: sync up sleep loop with sws
Viktor Szakats [Sun, 14 Jun 2026 12:29:13 +0000 (14:29 +0200)] 
rtspd: sync up sleep loop with sws

Check for `!got_exit_signal` as part of the `while()` expression,
instead of doing it after calling `curlx_wait_ms()`. To simplify and
improve consistency with rest of code.

Follow-up to 0653fa107f6fb03555d49da86a1fbfc659873f5b
Follow-up to 123c92c904b2f258ae69e211aa2663e80cb5429a

Closes #22006

7 weeks agotests/servers: do not interpret `unlink()` retval as `errno`
Viktor Szakats [Sun, 14 Jun 2026 10:44:57 +0000 (12:44 +0200)] 
tests/servers: do not interpret `unlink()` retval as `errno`

In `socksd` and `sws` error messages.

Also:
- show the messages only if `unlink()` failed.
- rename a return code variable and sync a message text for consistency.

Ref: https://pubs.opengroup.org/onlinepubs/9699919799/functions/unlink.html

Spotted by Copilot in `socksd.c`
Bug: https://github.com/curl/curl/pull/21998#discussion_r3409395013
Follow-up to 80eb71a3f5146f2ab5c5f8d8655d6861b5472668 #8687

Closes #22005

7 weeks agoperl: switch from backticks to `qx()`
Viktor Szakats [Tue, 19 May 2026 15:41:07 +0000 (17:41 +0200)] 
perl: switch from backticks to `qx()`

To make it easier to find external command invocation in the source.

Also drop backticks from a comment.

To find external command invocations in Perl code use:
```sh
git grep -E "((exec|qx|open2|open3|system)\(|open\(.+-\|)" $(<perlfiles>)
```

Refs:
https://perldoc.perl.org/functions/qx
https://perldoc.perl.org/perlop#Simpler-Quote-Like-Operators

Closes #21994

7 weeks agokrb5_sspi: fix error message on `DecryptMessage()` fail
Viktor Szakats [Sun, 14 Jun 2026 10:18:46 +0000 (12:18 +0200)] 
krb5_sspi: fix error message on `DecryptMessage()` fail

Spotted by GitHub Code Quality

Closes #22003

7 weeks agotelnet: drop an `int` cast no longer necessary
Viktor Szakats [Sun, 14 Jun 2026 10:26:46 +0000 (12:26 +0200)] 
telnet: drop an `int` cast no longer necessary

Spotted-by GitHub Code Quality

Follow-up to c5637baa06046d317c383d420f6cbc9ddb3b0870
Follow-up to 83a5e390654fb1e77c7c5d7bd32ba147ff022cbd

Closes #22002

7 weeks agosocket: use name `sockerr` for socket error variables
Viktor Szakats [Fri, 12 Jun 2026 21:42:50 +0000 (23:42 +0200)] 
socket: use name `sockerr` for socket error variables

Also:
- add comment explaining a `sockerr = errno` (vs. `SOCKERRNO`)
  assigment.

Closes #21998

7 weeks agosocks_sspi: invalid response length is a fatal error
Daniel Stenberg [Sun, 14 Jun 2026 10:13:42 +0000 (12:13 +0200)] 
socks_sspi: invalid response length is a fatal error

Pointed out by Zeropath
Closes #21999

7 weeks agoldap: base64 encode binary LDIF values with WinLDAP
Saud Alshareef [Fri, 12 Jun 2026 02:02:04 +0000 (05:02 +0300)] 
ldap: base64 encode binary LDIF values with WinLDAP

The WinLDAP backend only base64 encoded LDAP values when the attribute
name ended in ;binary. This made attributes such as jpegPhoto get
written as raw bytes, producing malformed LDIF output.

Match the OpenLDAP backend by also base64 encoding values with leading
or trailing blanks or non-printable bytes.

Fixes #21926
Reported-by: oreadvanthink on github
Closes #21982

7 weeks agosspi: free libcurl allocated memory with curlx_free
Daniel Stenberg [Fri, 12 Jun 2026 12:37:55 +0000 (14:37 +0200)] 
sspi: free libcurl allocated memory with curlx_free

DecryptMessage() decrypts the buffer in place, overwriting the original
contents. It does not allocate any new buffer so the single original
buffer should be freed using the same memory "system" that allocated it.

Reported-by: Trail of Bits
Closes #21990

7 weeks agotelnet: drop redundant interim variables
Viktor Szakats [Fri, 12 Jun 2026 21:50:03 +0000 (23:50 +0200)] 
telnet: drop redundant interim variables

Also reduce scope of a declaration.

Closes #21995

7 weeks agolib: transfer origin and proxy handling
Stefan Eissing [Fri, 12 Jun 2026 10:02:08 +0000 (12:02 +0200)] 
lib: transfer origin and proxy handling

Add `data->state.origin` as the origin the transfer is sending the
current request to/gets the response from. Use it for request specific
properties like authentication, hsts and cookie handling, etc.

Unless talking to a forwarding HTTP proxy (e.g. not tunneling),
`data->state.origin` and `conn->origin` are the same.

With a forwarding HTTP proxy in play, `conn->origin` is set to
`conn->http_proxy.peer` and `conn->bits.origin_is_proxy` (a new bit) is
set.

Remove the connection bits, now replaced with:

* `conn->bits.socksproxy` -> `conn->socks_proy.peer`
* `conn->bits.httpproxy` -> `conn->http_proy.peer`
* `conn->bits.proxy` -> `(conn->socks_proy.peer || conn->http_proy.peer`)
* `conn->bits.tunnel_proxy` -> (`conn->http_proy.peer && !conn->bits.origin_is_proxy`)
* `(conn->bits.httpproxy && !conn->bits.tunnel_proxy)` -> `conn->bits.origin_is_proxy`

Rename `noproxy.[ch]` to `proxy.[ch]`. Move the connection proxy setup
code from `url.c` to `proxy.c`.

Remove `data->info.conn_remote_port` as no one uses it.

Add test_40_02b for a SOCKS connection to a forwarding HTTPS proxy.

Update internal documentation about peers and creds.

Closes #21967

7 weeks agobuild: enable `-Wlogical-op` picky warning for GCC 4.4+
Viktor Szakats [Sat, 6 Jun 2026 12:24:29 +0000 (14:24 +0200)] 
build: enable `-Wlogical-op` picky warning for GCC 4.4+

Follow-up to 879a1514c3cf41926fd565db9e9ae62ab9733554 #21992

Closes #21893

7 weeks agosocket: introduce `SOCK_EAGAIN()` and use it
Viktor Szakats [Sun, 7 Jun 2026 23:21:44 +0000 (01:21 +0200)] 
socket: introduce `SOCK_EAGAIN()` and use it

To contain the logic of checking for both `EWOULDBLOCK` and/or `EAGAIN`
depending on platform/availability. Also to avoid checking for both if
they mapp to the same value, and to avoid PP guards around use.

This also ensures `EAGAIN` is consistently not checked on Windows, where
headers defined it, but `SOCKERRNO` never returns it, because curl maps
it to `WSAGetLastError()`.

If they map to the same value, checking them both in an `if` expression
trips GCC warning `-Wlogical-op` (the same way it triggers duplicate
case value error in `switch`).

Also:
- replace two `switch()` statements with the new macro.
- tests/server/sws: make two outliers use the new macro that were only
  checking for `EWOULDBLOCK` before this patch, in `connect_to()`.
- move variables to the left-side of expressions, where missing.
- rustls: use a variant of this macro that uses raw `EWOULDBLOCK`.
  Tried tracing it back to the origins, but I couldn't figure out if
  this is working as expected on all supported Windows versions in
  Rust. It seems to be using `GetLastError()`, according to
  https://docs.rs/system_error/0.2.0/system_error/, which would be
  probably incorrect.

Notes:
- it's probably a good idea to assign `SOCKERRNO` to a variable before
  passing it to this macro.

Cherry-picked from #21893

Closes #21992

7 weeks agoAmigaOS: fix build fallouts, re-add to CI
Viktor Szakats [Fri, 12 Jun 2026 15:51:22 +0000 (17:51 +0200)] 
AmigaOS: fix build fallouts, re-add to CI

Fix build issues:
- src: adjust `toolx_ftruncate()`.
- libtests/cli_ftp_upload: make `struct timeval` initialization portable.
- libtests/lib1960: do unconst in local `inet_pton()` macro.
- tests/server/dnsd: make it stub instead of failing the build.
- tests/server: make them link AmiSSL for `SocketBase`.

Also:
- bump AmiSSL to the latest release.
- add download hash checks and toolchain cache.
- sync restored code with local updates made since last year.

It takes 30 seconds per job, 1 minute in total.

Thanks-to: Bebbo
Thanks-to: Darren Banfi
Ref: https://github.com/curl/curl/pull/21989#issuecomment-4691380623
Follow-up to 7a14898264e9aa48f7f84f631288d728cade5d57 #17486

Closes #21993

7 weeks agoschannel: fix https proxy for client cert and certinfo
Stefan Eissing [Fri, 12 Jun 2026 10:33:44 +0000 (12:33 +0200)] 
schannel: fix https proxy for client cert and certinfo

When schannel operates in front of a proxy, it needs to use the proxy
ssl configs, not the transfers ones. Choose the configs as it is done in
other TLS backends.

Prior to this change the client cert for the destination was mistakenly
also used as the client cert for the proxy.

Prior to this change the proxy server certificate info was mistakenly
saved as the destination cert info. However, if the destination was a
TLS connection, the real destination cert info would overwrite the
proxy cert info. libcurl currently does not support proxy server cert
info AFAICT (see discussion in #21986).

Closes https://github.com/curl/curl/pull/21986

7 weeks agotelnet: fix old copy-paste typo in variable name
Viktor Szakats [Thu, 11 Jun 2026 22:42:55 +0000 (00:42 +0200)] 
telnet: fix old copy-paste typo in variable name

This code lacks tests, though we agreed it looks plausible enough to
merge it based on surrounding code. Even though this line has been
present for a long time. If you use this code, please report any results
or issues.

Reported by GitHub Code Quality

Follow-up to ae1912cb0d494b48d514d937826c9fe83ec96c4d

Closes #21979

7 weeks agoruntests: exit hard on duplicate test name
Daniel Stenberg [Fri, 12 Jun 2026 12:52:18 +0000 (14:52 +0200)] 
runtests: exit hard on duplicate test name

To make the mistake more noticeable

Closes #21991

7 weeks agomailmap: Darren Banfi
Daniel Stenberg [Fri, 12 Jun 2026 12:48:12 +0000 (14:48 +0200)] 
mailmap: Darren Banfi

7 weeks agoAmigaOS: curl_setup.h avoid explicit_bzero with clib2
Darren Banfi [Fri, 12 Jun 2026 11:12:06 +0000 (12:12 +0100)] 
AmigaOS: curl_setup.h avoid explicit_bzero with clib2

clib2 defines __NEWLIB__ after its system headers are included, but it
does not provide explicit_bzero().

curl therefore selects the explicit_bzero() path and fails to build with
m68k-amigaos-gcc:

```
../lib/curl_setup.h:1650:35: error: implicit declaration of function 'explicit_bzero' [-Werror=implicit-function-declaration]
 1650 | #define curlx_memzero(buf, size)  explicit_bzero(buf, size)
      |                                   ^~~~~~~~~~~~~~
curlx/strdup.c:115:5: note: in expansion of macro 'curlx_memzero'
  115 |     curlx_memzero(buf, size);
      |     ^~~~~~~~~~~~~
```

Excluding __CLIB2__ from the generic __NEWLIB__ branch makes curl use
its existing portable curlx_memzero() fallback. The full AmigaOS build
then completes successfully.

I've tested the following on Amiga OS 3.2.3 with this patch and latest
build.

- HTTP and HTTPS transfers
- AmiSSL certificate handling
- redirects
- downloads and file output
- timeout handling with the expected exit code 28
- repeated execution with clean exits
- no crashes or regressions observed

Follow-up to 066478f6346a2d987a9ecc3bd3bf45764d69c1c4 #21598

Closes #21989

7 weeks agoGHA/distcheck: switch to parse `info.json`
Viktor Szakats [Fri, 12 Jun 2026 11:26:49 +0000 (13:26 +0200)] 
GHA/distcheck: switch to parse `info.json`

Refs:
https://github.com/curl/curl-www/commit/c569aaa16136a615f5b299ea63168996a995521b
https://github.com/curl/curl-www/pull/596

Follow-up to b3bc61ab6853924e8114184b22538fb81f28ba0f #21978

Closes #21988

7 weeks agoruntests: error out on duplicate test names
Daniel Stenberg [Fri, 12 Jun 2026 08:54:47 +0000 (10:54 +0200)] 
runtests: error out on duplicate test names

Closes #21984

7 weeks agoconfig2setopts: use default protocol properly
Daniel Stenberg [Fri, 12 Jun 2026 07:01:22 +0000 (09:01 +0200)] 
config2setopts: use default protocol properly

Verified by test 1724, 1725 and 2036

Closes #21983

7 weeks agochecksrc: silence `-b` option debug message
Viktor Szakats [Fri, 12 Jun 2026 09:55:29 +0000 (11:55 +0200)] 
checksrc: silence `-b` option debug message

Closes #21985

7 weeks agoGHA: drop `brew update` from all jobs
Viktor Szakats [Fri, 12 Jun 2026 00:13:03 +0000 (02:13 +0200)] 
GHA: drop `brew update` from all jobs

After adding it a month ago (where missing) to fix a failure.

Removing this time to fix a different failure (on Linux), and also to
improve CI performance. Some install steps take over a minute, most of
that spent on `brew update`.

GH runner images also enabled extra taps which may contribute to further
delays, and seen to make it more fragile if GH itself struggles (taps
are hosted there.)

Refs:
https://github.com/curl/curl/actions/runs/27384213554/job/80927624171
https://github.com/curl/curl/actions/runs/27382368348/job/80921910973

Follow-up to db5d8886738ca8a335898c497ae4808f65ea7781 #21608

Closes #21981

8 weeks agolib695, lib757: fix truncated newline in error messages
Viktor Szakats [Thu, 11 Jun 2026 22:51:57 +0000 (00:51 +0200)] 
lib695, lib757: fix truncated newline in error messages

Closes #21980

8 weeks agoGHA/distcheck: use `https://curl.se/info`
Viktor Szakats [Thu, 11 Jun 2026 22:27:05 +0000 (00:27 +0200)] 
GHA/distcheck: use `https://curl.se/info`

Suggested-by: Daniel Stenberg
Ref: https://github.com/curl/curl/pull/21977#issuecomment-4684764838
Follow-up to 0cd0a64de4731ad5da138f3b4a314c735cd1dc02 #21977

Closes #21978

8 weeks agoRELEASE-NOTES: synced
Daniel Stenberg [Thu, 11 Jun 2026 21:28:30 +0000 (23:28 +0200)] 
RELEASE-NOTES: synced

8 weeks agolibtests: add and use tutil_throwaway_cb
Daniel Stenberg [Thu, 11 Jun 2026 14:58:28 +0000 (16:58 +0200)] 
libtests: add and use tutil_throwaway_cb

This is an implementation of a CURLOPT_WRITEFUNCTION callback that just
throws away the content and returns success. Saves us from having to
reimplement it many times in different tests.

Closes #21971

8 weeks agotests: add the "--resolve" keyword to tests that lack it
Fabian Keil [Sun, 7 Jun 2026 11:52:46 +0000 (13:52 +0200)] 
tests: add the "--resolve" keyword to tests that lack it

... even though they use the curl option "--resolve".

This makes it more convenient to choose or skip the tests.

For example Privoxy's cts test framework relies on the "--resolve"
keyword when executing the "upstream-tests" scenario to skip curl
tests that aren't expected to work when the requests are made through
Privoxy. While some of the modified tests are already skipped for
other reasons through other means when testing Privoxy, it's good to
be consistent.

Closes #21930

8 weeks agoGHA/distcheck: fix parsing the download page
Viktor Szakats [Thu, 11 Jun 2026 20:02:31 +0000 (22:02 +0200)] 
GHA/distcheck: fix parsing the download page

Fixing:
```
curl: (3) URL rejected: Malformed input to a URL function
```
Ref: https://github.com/curl/curl/actions/runs/27370389568/job/80880800780

Refs:
https://github.com/curl/curl-www/commit/1735f6af6ae75af08e646c0407cdc69cf6a0855d
https://github.com/curl/curl-www/pull/593

Follow-up to 2cc171cbd4a9eac84f5c62c5b987347e5f8880e1 #21759

Closes #21977

8 weeks agotelnet: fix error message typos
Viktor Szakats [Thu, 11 Jun 2026 18:01:18 +0000 (20:01 +0200)] 
telnet: fix error message typos

Spotted by GitHub Code Quality

Closes #21976

8 weeks agoruntests: fix tests for curl builds with embedded CA bundle
Viktor Szakats [Thu, 11 Jun 2026 15:08:05 +0000 (17:08 +0200)] 
runtests: fix tests for curl builds with embedded CA bundle

Reported-by: Rainer Jung
Co-authored-by: Rainer Jung
Fixes #21970
Follow-up to 8a3740bc8e558b9a9d4a652b74cf27a0961d7010 #14059

Closes #21973

8 weeks agotidy-up: add spaces around equal operators where missing
Viktor Szakats [Thu, 11 Jun 2026 15:22:30 +0000 (17:22 +0200)] 
tidy-up: add spaces around equal operators where missing

Found via regex search: `=[^~>= ]`

Closes #21975

8 weeks agotidy-up: miscellaneous
Viktor Szakats [Tue, 9 Jun 2026 09:10:00 +0000 (11:10 +0200)] 
tidy-up: miscellaneous

- GHA/windows: drop redundant double-quotes.
- CMake/PickyWarnings: improve/shorten comment.
- INTERNALS: fix typo in LibreSSL release date.
- drop redundant parentheses from single variables and sole `#if`
  expressions.
- cf-ip-happy: fix missing space from error string.
- telnet: fix parentheses in commented PP code.
- lib1922: fix typo test output text.
- smbserver: unfold lines.
- smbserver: use f-string.
- smbserver: initialize binary string as b``.
- fix typos in comments.

Closes #21972

8 weeks agoasyn-thrdd: add IPv6 guards
sourceturner [Sat, 6 Jun 2026 15:23:49 +0000 (17:23 +0200)] 
asyn-thrdd: add IPv6 guards

It seems that the usual '#ifdef USE_IPV6' guards have been overlooked in
lib/asyn-thrdd.c.

This commit makes sure that the code compiles if IPv6 is not available.

Closes #21881

8 weeks agoGHA: update debian:bookworm-slim Docker digest to 96e378d
renovate[bot] [Thu, 11 Jun 2026 11:30:28 +0000 (11:30 +0000)] 
GHA: update debian:bookworm-slim Docker digest to 96e378d

Closes #21958

8 weeks agoGHA/windows: bump Cygwin Action and adjust version number
Viktor Szakats [Thu, 11 Jun 2026 15:41:21 +0000 (17:41 +0200)] 
GHA/windows: bump Cygwin Action and adjust version number

It seems the commit hash behind the v6.1 tag is changing, and the latest
version is actually v6.0.2, which is currently mapped to the v6.1 hash.

Fixing:
```
warning[ref-version-mismatch]: action's hash pin has mismatched or missing version comment
  --> .github/workflows/windows.yml:98:87
   |
98 |       - uses: cygwin/cygwin-install-action@711d29f3da23c9f4a1798e369a6f01198c13b11a # v6.1
   |         ---------------------------------------------------------------------------   ^^^^ points to commit 3f0a3f9f988f
   |         |
   |         is pointed to by tag v6.0.1
```

Ref: https://github.com/cygwin/cygwin-install-action/issues/59

Closes #21974

8 weeks agohttp_digest: return better error
Daniel Stenberg [Thu, 11 Jun 2026 13:46:23 +0000 (15:46 +0200)] 
http_digest: return better error

It is not a content encoding error.

Found by the GitHub AI thing.

Closes #21969

8 weeks agoCURLOPT_WRITEFUNCTION.md: remove stray reference to HSTS
Daniel Stenberg [Thu, 11 Jun 2026 13:39:06 +0000 (15:39 +0200)] 
CURLOPT_WRITEFUNCTION.md: remove stray reference to HSTS

It appears to have landed here by mistake

Closes #21968

8 weeks agocf-ip-happy.c: minor comment typo
Daniel Stenberg [Thu, 11 Jun 2026 13:44:28 +0000 (15:44 +0200)] 
cf-ip-happy.c: minor comment typo

8 weeks agocontent_encoding: fix non-last chunked rejection
Daniel Stenberg [Thu, 11 Jun 2026 08:59:05 +0000 (10:59 +0200)] 
content_encoding: fix non-last chunked rejection

Even when two 'chunked' are listed and neither is the last encoding the
transfer is rejected.

Verified by test 1722 and 1723

Reported-by: violet12331 on hackerone
Closes #21966

8 weeks agoCURLINFO_CONTENT_LENGTH_UPLOAD_T.md: expand
Daniel Stenberg [Wed, 10 Jun 2026 21:41:51 +0000 (23:41 +0200)] 
CURLINFO_CONTENT_LENGTH_UPLOAD_T.md: expand

Fixes #21953
Reported-by: BazaarAcc32 on github
Closes #21956

8 weeks agomulti: remove a stale comment
Daniel Stenberg [Thu, 11 Jun 2026 07:29:22 +0000 (09:29 +0200)] 
multi: remove a stale comment

It tricks humans and AIs alike.

Closes #21961

8 weeks agoSECURITY-ADVISORY.md: expand
Daniel Stenberg [Thu, 11 Jun 2026 07:46:09 +0000 (09:46 +0200)] 
SECURITY-ADVISORY.md: expand

Fill in missing information and rephrase a little

Closes #21964

8 weeks agoh3proxy: no stream userdata
Stefan Eissing [Thu, 11 Jun 2026 07:37:46 +0000 (09:37 +0200)] 
h3proxy: no stream userdata

Do not set the easy handle opening a proxy tunnel as userdata on the
stream. The ease handle might go out of scope long before the tunnel
stream is closed.

Closes #21962

8 weeks agocf-ip-happy: update documentation
Stefan Eissing [Thu, 11 Jun 2026 06:29:22 +0000 (08:29 +0200)] 
cf-ip-happy: update documentation

Reported-by: correctmost on github
Fixes #21957
Closes #21959

8 weeks agocf-socket: make Curl_addr2string static
Stefan Eissing [Wed, 10 Jun 2026 11:18:30 +0000 (13:18 +0200)] 
cf-socket: make Curl_addr2string static

Move as sockaddr2string() into cf-socket.c where its only callers are.

Mark as UNITTEST for unit1609.

Move "struct Curl_sockaddr_ex" into sockaddr.h, so connect.h and
cf-socket.h can be included without all the system headers needed.

Closes #21946

8 weeks agodigest: flush proxy state on proxy or credential change
alhudz [Wed, 10 Jun 2026 13:00:13 +0000 (18:30 +0530)] 
digest: flush proxy state on proxy or credential change

Closes #21951

8 weeks agoCURLOPT_WRITEFUNCTION.md: mention redirects
Daniel Stenberg [Wed, 10 Jun 2026 12:01:11 +0000 (14:01 +0200)] 
CURLOPT_WRITEFUNCTION.md: mention redirects

Reported-by: BazaarAcc32 on github
Fixes #21945
Closes #21950

8 weeks agoconnect: turn conn_get_first_origin into static
Daniel Stenberg [Wed, 10 Jun 2026 11:37:22 +0000 (13:37 +0200)] 
connect: turn conn_get_first_origin into static

This function is only used within this source file.

Closes #21948

8 weeks agotidy-up: drop stray comparisons with literal zero
Viktor Szakats [Wed, 10 Jun 2026 11:03:41 +0000 (13:03 +0200)] 
tidy-up: drop stray comparisons with literal zero

Drop from:
- strcmp, strcmpi, strncmp, memcmp, lstat, getrlimit, setrlimit, fseek,
  fstat
- autotools detection snippets.
- smooth-gtk-thread: simplify `!var != 0` expression.

Closes #21947

8 weeks agobuild: enable `-Wformat-signedness`, fix issues found
Viktor Szakats [Thu, 16 Apr 2026 08:52:57 +0000 (10:52 +0200)] 
build: enable `-Wformat-signedness`, fix issues found

Adjust code to avoid `-Wformat-signedness` warnings, while making sure
that enums are always cast to a known type when passing them to `printf`
functions, to support compilers and compiler settings where enums are
not default-size signed ints.

- cast integers printed as hex to `unsigned`. (63 times, 20 of them in
  `mbedtls.c`)
- cast misc enums to `int` for printing. (31 times)
- cast `CURL_LOCK_DATA_*` enums to `int`. (4 times)
- cast `CURL_FORMADD_*` enums to `int`. (13 times)
- cast `CURLSHE_*` enums to `int`. (3 times)
- cast `CURLUE_*` enums to `int`. (33 times)
- cast `CURLMSG_*` enums to `int`. (6 times)
- cast `CURLE_*` enums to `int`. (~380 times)
- unit1675: fix mask.
  Follow-up to 7c34365ccea19949317878c7fcd5f7376e2e09f1 #21879

Ref: #18343 (initial attempt)

Closes #20848

8 weeks agomqtt: return error on truncated Remaining Length
Daniel Stenberg [Wed, 10 Jun 2026 11:52:13 +0000 (13:52 +0200)] 
mqtt: return error on truncated Remaining Length

Pointed out by: Zeropath

Closes #21949

8 weeks agoGHA: update awslabs/aws-lc from v1.73.0 to v5.0.0
renovate[bot] [Wed, 10 Jun 2026 01:46:49 +0000 (01:46 +0000)] 
GHA: update awslabs/aws-lc from v1.73.0 to v5.0.0

Closes #21941

8 weeks agoGHA: update ruff from v0.15.12 to v0.15.16
renovate[bot] [Wed, 10 Jun 2026 01:46:44 +0000 (01:46 +0000)] 
GHA: update ruff from v0.15.12 to v0.15.16

Closes #21940

8 weeks agongtcp2: share common functionality
Stefan Eissing [Fri, 5 Jun 2026 10:55:50 +0000 (12:55 +0200)] 
ngtcp2: share common functionality

Share common functions/structs between ngtcp2 HTTP/3 and the proxy
version.

Fix bugs in proxy implementation when it comes to stream and pollset
handling and transfer lifetimes.

Curl_multi_xfer_sockbuf_borrow: work without multi

When a connection gets shutdown by a share, the easy handle used is
share->admin and it does not have a multi handle. In that case let
Curl_multi_xfer_sockbuf_borrow() allocate a buffer to be freed on
release.

This happens when a TLS filter sends its last notify through a HTTP/3
proxy tunnel.

Closes #21871

8 weeks agotest 527: bring back, not a dupe
Daniel Stenberg [Wed, 10 Jun 2026 06:14:10 +0000 (08:14 +0200)] 
test 527: bring back, not a dupe

Fixed the name to clarify the difference to 526.

Follow-up to 4ead4285a6af5d5645d4ad
Closes #21942

8 weeks agodigest: flush state on origin or credential change
Daniel Stenberg [Wed, 10 Jun 2026 08:27:50 +0000 (10:27 +0200)] 
digest: flush state on origin or credential change

Verified by test 1686

Closes #21944

8 weeks agotests: restore 1030 and 611
Daniel Stenberg [Tue, 9 Jun 2026 16:44:21 +0000 (18:44 +0200)] 
tests: restore 1030 and 611

They were not exact duplicates. Tweaked their names to clarify.

Also renamed 608 accordingly.

Follow-up to 4ead4285a6af5d5645d4a

Spotted-by: Dan Fandrich
Closes #21938

8 weeks agoappveyor: bump 3 VS2022 jobs to VS2026
Viktor Szakats [Tue, 9 Jun 2026 17:57:38 +0000 (19:57 +0200)] 
appveyor: bump 3 VS2022 jobs to VS2026

Also:
- install CMake 4.2.1 manually for VS2026 jobs, because the preinstalled
  version (4.1.2) does not yet support the compatible generator.
- VisualStudioSolution VS2010 job to VS2015 worker image (from VS2013).
  VS2013 is no longer listed on the AppVeyor support page.
- downgrade OpenSSL to 3.5 (from 3.6) for the VS2022 job, to add
  variation.

Note: the jobs run much slower after bumping to VS2026. This seems to be
due slower configure and build steps.

Refs:
https://github.com/appveyor/website/commit/9ef4152eda92d0f8a486ab67824a6d420e1151e4
https://github.com/appveyor/website/pull/912
https://github.com/appveyor/build-images/commit/fa7f7b928ebee4e2cfc6eccc953d2dec95374114
https://github.com/appveyor/build-images/pull/175
https://www.appveyor.com/docs/windows-images-software/
https://cmake.org/cmake/help/latest/generator/Visual%20Studio%2018%202026.html

Closes #21939

8 weeks agosmbserver: update internal id generation for Python 3
Viktor Szakats [Tue, 9 Jun 2026 15:44:05 +0000 (17:44 +0200)] 
smbserver: update internal id generation for Python 3

Also:
- make next id based on highest in list + 1.
  (was: last id in list + 1)
- unfold a line.

Spotted by GitHub Code Quality

Ref: https://portingguide.readthedocs.io/en/latest/dicts.html?highlight=keys

Closes #21937

8 weeks agoRELEASE-NOTES: synced
Daniel Stenberg [Tue, 9 Jun 2026 14:58:21 +0000 (16:58 +0200)] 
RELEASE-NOTES: synced

8 weeks agohsts: duplicate live HSTS data in curl_easy_duphandle
A Johnston [Mon, 1 Jun 2026 21:52:23 +0000 (14:52 -0700)] 
hsts: duplicate live HSTS data in curl_easy_duphandle

Verified by test 1922

Closes #21809

8 weeks agotests: enhance names, remove duplicates
Daniel Stenberg [Tue, 9 Jun 2026 12:25:51 +0000 (14:25 +0200)] 
tests: enhance names, remove duplicates

- test 1030: remove, duplicate of 154
- test 1105: make name unique
- test 161: make name reflect what it tests
- test 2074: correct the name
- test 310: improve name
- test 358: correct the name
- test 409: removed, duplicate of 401
- test 472: clarify the test name (how it differs from 439)
- test 1509: update name
- test 527: duplicate of 526
- test 758: separate the name from 530
- test 611: duplicate of 608, remove
- test 639: adjust the name
- test 688: minor name tweak to clarify
- test 708: enhance name
- test 800/847: clarify the names
- test 1520: dedupe the name
- test 962: enhance name
- test 1196/2203: enhanced names
- test 1211: name tweak
- test 1256/1257: enhance the names
- test 1483: fix name
- test 1541: fix name
- test 1553: fix name
- test 1609: removed, exact duplicate of 1607
- test 2200: fix name
- test 3031: corret the name
- test 3016/3203: fix names and keywords
- test 3201/3220: enhance names
- test 3212: fix name
- add missing FILE keywords
- drop FAILURE as keyword

Closes #21936

8 weeks agotidy-up: drop redundant `== NULL` syntax
Viktor Szakats [Tue, 9 Jun 2026 12:18:02 +0000 (14:18 +0200)] 
tidy-up: drop redundant `== NULL` syntax

Where missed by checksrc.

Closes #21935

8 weeks agotidy-up: drop redundant `!= NULL` syntax
Viktor Szakats [Tue, 9 Jun 2026 11:38:17 +0000 (13:38 +0200)] 
tidy-up: drop redundant `!= NULL` syntax

Where missed by checksrc.

Closes #21932

8 weeks agoGHA: update dependency openssl/openssl to v4.0.1
renovate[bot] [Tue, 9 Jun 2026 12:06:35 +0000 (12:06 +0000)] 
GHA: update dependency openssl/openssl to v4.0.1

Closes #21934

8 weeks agopsl: require libpsl 0.16.0 (2016-12-10) or greater
Viktor Szakats [Tue, 9 Jun 2026 12:02:32 +0000 (14:02 +0200)] 
psl: require libpsl 0.16.0 (2016-12-10) or greater

Debian Stretch offers 0.17.0.

Ref: https://github.com/rockdaboot/libpsl/releases/tag/libpsl-0.16.0
Ref: https://sources.debian.org/src/libpsl/

Closes #21933

8 weeks agohttp-proxy: verify CONNECT response headers
alhudz [Tue, 9 Jun 2026 10:56:14 +0000 (16:26 +0530)] 
http-proxy: verify CONNECT response headers

Verifed by test 2107

Closes #21927

8 weeks agosigv4: URL encode the user name in the header
Daniel Stenberg [Tue, 9 Jun 2026 09:40:41 +0000 (11:40 +0200)] 
sigv4: URL encode the user name in the header

- split into sub functions
- add 'aws-sigv4' as keyword for many tests

Verify with test 3222

Reported-by: Trail of Bits
Closes #21923

8 weeks agosmbserver: check impacket presence differently
Viktor Szakats [Tue, 9 Jun 2026 10:58:24 +0000 (12:58 +0200)] 
smbserver: check impacket presence differently

To silence ruff and GitHub CodeQL warnings.

Closes #21929

8 weeks agopytest: use `Optional[]`, adjust whitespace
Viktor Szakats [Tue, 9 Jun 2026 10:46:17 +0000 (12:46 +0200)] 
pytest: use `Optional[]`, adjust whitespace

Reported by GitHub Code Quality

Closes #21928

8 weeks agotidy-up: use uppercase `TRUE`/`FALSE` where missing
Viktor Szakats [Tue, 9 Jun 2026 10:09:46 +0000 (12:09 +0200)] 
tidy-up: use uppercase `TRUE`/`FALSE` where missing

Keep it only in external API calls and C++ code.

Also:
- curlx/fopen: replace with `!!`.

Spotted by GitHub Code Quality in cf-socket.c.

Closes #21925

8 weeks agopytest: add comment to empty except branch
Viktor Szakats [Tue, 9 Jun 2026 10:33:24 +0000 (12:33 +0200)] 
pytest: add comment to empty except branch

To silence GitHub CodeQL.

Follow-up to 4aa8cc3c4ad567ba5e96d9901ff22238fbe01a0c #21924

8 weeks agounit1675: fix potential memory leak on dynbuf fail path
Viktor Szakats [Tue, 9 Jun 2026 09:28:06 +0000 (11:28 +0200)] 
unit1675: fix potential memory leak on dynbuf fail path

Spotted by GitHub Code Quality

Closes #21922

8 weeks agopytest: fix remaining code checker warnings
Viktor Szakats [Tue, 9 Jun 2026 09:14:17 +0000 (11:14 +0200)] 
pytest: fix remaining code checker warnings

- curl.py: delete commented no-op code.
- certs.py, curl.py: narrow down exceptions to fix:
  Except block handles 'BaseException'
- test_20_websockets: add comment to empty except branch.

Reported by GitHub CodeQL

Closes #21924

8 weeks agocf-socket: store errno from do_connect in ctx->error
Yedaya Katsman [Mon, 8 Jun 2026 19:48:45 +0000 (22:48 +0300)] 
cf-socket: store errno from do_connect in ctx->error

This fixes a misleading log in verbose mode when ipv6 connectivity isn't
available, presumably also in other cases:

```
* Immediate connect fail for 2a00:1450:4028:806::200e: Network is unreachable
* connect to 2a00:1450:4028:806::200e port 443 from :: port 0 failed: Success
```

Closes #21914

8 weeks agocookie: tailmatch the domains for secure override
Daniel Stenberg [Mon, 8 Jun 2026 14:37:44 +0000 (16:37 +0200)] 
cookie: tailmatch the domains for secure override

If a SECURE cookie is set for a sub-domain (`example.com`) and is then
attempted to get set again for more specific part of that domain
(`www.example.com`) without the SECURE property, the second occurance
should not be allowed.

Reported-by: Trail of Bits
Verified by test 3305
Closes #21910

8 weeks agotidy-up: miscellaneous
Viktor Szakats [Fri, 5 Jun 2026 21:02:11 +0000 (23:02 +0200)] 
tidy-up: miscellaneous

- badwords: replace stray synonyms with 'null-terminator'.
- tests/FILEFORMAT.md: tidy up feature descriptions.
- printf: replace stray `%i` masks with `%d` for consistency.
- pytest: add comments for empty excepts to try silencing GitHub CodeQL
  warnings.
- tool1394, unit1675: merge nested `if`s.
- dnscache: fix typo in comment.
- fix whitespace, indent and newlines.

Closes #21921

8 weeks agows: make pong sending lazy
Stefan Eissing [Mon, 8 Jun 2026 14:57:01 +0000 (16:57 +0200)] 
ws: make pong sending lazy

Do not send PONG frames unless there is sufficient space left in the
websocket send buffer. A server might be lazy in reading our data and
intermediary PONG frames can be skipped by a client (RFC 6455, ch.
5.5.3).

Add test case measuring no real RSS increase on a server blasting with
PING frames.

Closes #21911

8 weeks agopeer.h: fix typo in comment
Daniel Stenberg [Tue, 9 Jun 2026 08:38:18 +0000 (10:38 +0200)] 
peer.h: fix typo in comment

Closes #21920

8 weeks agodocs: returned header size reflects HTTP/1-style format
Viktor Szakats [Mon, 8 Jun 2026 16:39:27 +0000 (18:39 +0200)] 
docs: returned header size reflects HTTP/1-style format

Ref: #21889

Closes #21912

8 weeks agopytest: close file handles after use (cont.), and tidy-ups
Viktor Szakats [Tue, 9 Jun 2026 00:08:30 +0000 (02:08 +0200)] 
pytest: close file handles after use (cont.), and tidy-ups

- dante.py, dnsd.py, sshd.py: drop redundant conditions.
  Spotted in sshd by GitHub Code Quality.
- curl.py: comment out `if` to silence CodeQL warning.

Reported by GitHub CodeQL

Follow-up to 8145476d5dd97d0ec704e9ea65b2f2028b8a945c #21916

Closes #21917

8 weeks agoresolve: Mention in error that IP address is expected
Yedaya Katsman [Fri, 5 Jun 2026 14:15:59 +0000 (17:15 +0300)] 
resolve: Mention in error that IP address is expected

If you try using a DNS name like connect-to supports it can be confusing that
it is illegal. Also make it a bit more readable

Closes #21913

8 weeks agodigest: escape control codes too
Daniel Stenberg [Mon, 8 Jun 2026 21:21:55 +0000 (23:21 +0200)] 
digest: escape control codes too

Since the username is decoded when used and control codes are accepted
in HTTP usernames in general, the username encoding for the Digest auth
needs to percent encode such bytes.

Verified by test 3221

Reported-by: Trail of Bits
Closes #21915

8 weeks agourlapi: URL decode hostname before IP address normalization
Daniel Stenberg [Tue, 9 Jun 2026 06:18:18 +0000 (08:18 +0200)] 
urlapi: URL decode hostname before IP address normalization

With this, IPv6 addresses that end with '%25' with no following zone id are
considered invalid.

Extend test 1560 to verify

Reported-by: Hem Parekh
Closes #21918

8 weeks agopytest: close file handles after use, and two minor tidy-ups
Viktor Szakats [Mon, 8 Jun 2026 21:27:32 +0000 (23:27 +0200)] 
pytest: close file handles after use, and two minor tidy-ups

Also:
- drop two unreachable return statements.
- test_17_ssl_use: avoid implicit string concatenations in lists.

Reported by GitHub CodeQL

Closes #21916

8 weeks agochecksrc-all.pl: do not check files multiple times rc-8_21_0-2
Viktor Szakats [Mon, 8 Jun 2026 11:56:49 +0000 (13:56 +0200)] 
checksrc-all.pl: do not check files multiple times

Restrict `git ls-files` to return `*.[ch]` files within `$dir` only.
Before this patch it returned files in subdirectories too, which did
double work and may have made `checksrc.pl` pick `.checksrc` from the
first such subdirectory, masking the one in `$dir`. (current curl tree
is not affected)

Ref: https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec

Follow-up to 33f606cd51995b68a0f68ac478f7395d8acda17b #20439

Closes #21909

8 weeks agochunked: reject invalid bytes in trailer
alhudz [Mon, 8 Jun 2026 05:07:34 +0000 (10:37 +0530)] 
chunked: reject invalid bytes in trailer

Trailers are delivered to the application as headers via
CLIENTWRITE_TRAILER, but unlike regular response headers they skipped
the verify_header() checks, so a server could smuggle a nul byte (or
stray CR) into a header reaching CURLOPT_HEADERFUNCTION and
curl_easy_header().

Run each assembled trailer line through Curl_verify_header(), the same
validation used for normal headers.

Covered by the new test 2106.

Closes #21896

8 weeks agossl native_ca_store: always reinit
Stefan Eissing [Mon, 8 Jun 2026 08:11:30 +0000 (10:11 +0200)] 
ssl native_ca_store: always reinit

Add bit `native_ca_store_opt` to keep the setting of
CURLOPT_(PROXY_)SSL_OPTIONS and use that to calculate every easy
transfer if a native CA store shall be used or not.

This avoids `native_ca_store` getting stuck on TRUE after being set
once.

Closes #21902

8 weeks agonetrc: remember and check filename loaded
Stefan Eissing [Mon, 8 Jun 2026 09:28:57 +0000 (11:28 +0200)] 
netrc: remember and check filename loaded

Remember the filename of a loaded netrc file to detect changed
configurations in a reused easy handle.

Closes #21903

8 weeks agoCURLOPT_DOH_URL.md: does not inherit proxy options
Daniel Stenberg [Mon, 8 Jun 2026 10:55:40 +0000 (12:55 +0200)] 
CURLOPT_DOH_URL.md: does not inherit proxy options

Closes #21904

8 weeks ago_ENVIRONMENT.md. Windows does case insensitive env variables
Daniel Stenberg [Mon, 8 Jun 2026 10:40:55 +0000 (12:40 +0200)] 
_ENVIRONMENT.md. Windows does case insensitive env variables

Closes #21907

8 weeks agoGHA: update dependency pizlonator/fil-c to v0.679
renovate[bot] [Mon, 8 Jun 2026 05:13:07 +0000 (05:13 +0000)] 
GHA: update dependency pizlonator/fil-c to v0.679

Closes #21897