Skip to content

Resolve conflicts#10

Merged
devkdas merged 20 commits intomasterfrom
resolve-conflicts
Sep 2, 2025
Merged

Resolve conflicts#10
devkdas merged 20 commits intomasterfrom
resolve-conflicts

Conversation

@devkdas
Copy link
Copy Markdown
Owner

@devkdas devkdas commented Sep 2, 2025

No description provided.

bagder and others added 19 commits August 29, 2025 09:45
As SIZE_MAX exists in C99

Assisted-by: Stefan Eissing
Assisted-by: Jay Satiro

Ref: curl#18406
Closes curl#18426
Perl got bumped from 5.38.4 to 5.40.3. The new version crashes when
loading the `Win32::Process*` modules built and cached in CI. The build
job uses Perl 5.38.4.

To avoid the crash, include the Perl version (hashed) in the cache key,
so that it's only loaded when the Perl version matches.

This solution is imperfect, because some of the jobs will not use the
Perl modules in transition periods, when different jobs use different
Perl versions. Anyway, can't think of a better one for now. Another
option is to drop the effort with these modules. After all they did not
help with crashes and hangs, nor with performance. While adding quite
a bit of CI complexity.

Also:
- test early if the modules load and log the result.

Follow-up to 52775a7 curl#18296

Closes curl#18425
Default timeout is hardcoded (10 seconds) and doesn't respect
--connect-timeout parameter. In some cases 10 seconds can be not enough
or too long to "establish a connection". Moreover the non-working
--connect-timeout parameter for http3 is confusing. This change makes
the handshake timeout equal to --connect-timeout, if it's set.
Discussion is here curl#18427

Closes curl#18431
Handle errors returned by the callback the same for 0-length writes as
for all the others.

Closes curl#18428
To have it included by the time checking for `SIZE_MAX` and `SSIZE_MAX`.

Ref: 93f333c curl#18426 curl#18406

Closes curl#18430
- using {} with single entries makes little sense
- when using {} sets with two entry lists, there can only be 64 to reach
  maximum number of URLs

Verify the max check in test 761
In some configs they happen

Closes curl#18441
This allows --remote-time to set dates before 1970.

Due to a minor omission in the API, it will still avoid setting the time
if it is indeed exactly epoch 0 (jan 1 1970).

Verified by test 762

Fixes curl#18424
Reported-by: Terence Eden
Closes curl#18443
To avoid having to alloc or manage it separately.

Closes curl#18442
Instead of checking it runtime. CodeSonar pointed out that if it
actually CAN legitimately be NULL here, then we need to do more checks
for it...

Closes curl#18440
test_10_08, uploading larger files for a h2 proxy, sporadically fails
with a decrpytion error on received data in AWS-LC. The frequency can
be increased by simulated network receive blocks.

Not setting a 4 * TLS record sized buffer, leaving AWS-LC at its
default buffer size seems to mitigate this problem.

Closes curl#18434
The libcurl API for CURLINFO_FILETIME_T clearly says it contains -1 if
not set. Everything else is a valid time stamp so use that.

Follow-up to 54f1ef0
Closes curl#18446
Only -1 means bad value, all others are acceptable.

Ref: curl#18424
Closes curl#18447
Split out adding of individual request headers into a switch. Check
the connection http version only on fresh connections, use separate
methods.

Add TE: header directly without allocation. Add bit for indicating
Connection: header has been added and custom headers should not do
that again.

Closes curl#18444
By returning error separately on parse errors and avoiding magic
numbers, this function can now return 0 or -1 as proper dates when such
a date string is provided.

Closes curl#18445
This allows IDEs that support this standard to automatically use the
correct formatting options.

Closes curl#18409
@devkdas devkdas merged commit 8fc23b5 into master Sep 2, 2025
1 check passed
@devkdas devkdas deleted the resolve-conflicts branch September 2, 2025 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants