Skip to content

Some curl fixes - #6685

Merged
swick merged 3 commits into
flatpak:mainfrom
razzeee:curl-fixes
Jun 15, 2026
Merged

swick merged 3 commits into
flatpak:mainfrom
razzeee:curl-fixes

Conversation

@razzeee

@razzeee razzeee commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@bbhtt

bbhtt commented Jun 12, 2026

Copy link
Copy Markdown
Collaborator

it would be useful to document the motivation in the commit body and the tests seem to be failing.

@razzeee

razzeee commented Jun 14, 2026

Copy link
Copy Markdown
Contributor Author

Yeah, that was a real bug, that was surfaced by that I think.

@swick

swick commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Two things:

  • Your commit messages need to be wrapped
  • The last commit is a fix which fixes a failing test, which means a previous commit is now not passing all tests. Needs to be re-ordered.

razzeee added 3 commits June 15, 2026 11:45
Signature downloads can use a different URL from the OCI registry
itself, so they must not depend on TLS options left on the reused curl
handle. Resolve certificates for the URI and pass them explicitly.
Previously the curl object potentially leaked cert infos from different
urls
We did not report the written bytes of the aborted stream before - so
curl thought that we wrote all bytes.
@razzeee

razzeee commented Jun 15, 2026

Copy link
Copy Markdown
Contributor Author

Updated accordingly.

NULL, NULL, NULL,
cancellable, &local_error);
certificates = flatpak_get_certificates_for_uri (uri_s, &local_error);
if (local_error)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I prefer to check the result of the function call (certificates == NULL) instead of the error itself, but this is inconsistent in flatpak, so let's not block on it.

@swick
swick added this pull request to the merge queue Jun 15, 2026
Merged via the queue into flatpak:main with commit 4ff158c Jun 15, 2026
11 checks passed
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.

4 participants