Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libcurl fixes #5074

Merged
merged 2 commits into from
Sep 6, 2022
Merged

libcurl fixes #5074

merged 2 commits into from
Sep 6, 2022

Conversation

git-bruh
Copy link
Contributor

@git-bruh git-bruh commented Sep 3, 2022

The CURLOPT_PROTOCOLS option has been deprecated for CURLOPT_PROTOCOLS_STR in 7.85.0 and using CURLOPT_PROTOCOLS returns an error code. Nvm, I mistook the line numbers, using the deprecated option works fine as of now.

A check has also been added to ensure that curl actually supports HTTP2 before trying to use it

Also all the error code checking seems to use CURLM_OK instead of CURLE_OK. Is this intentional? Doesn't matter though since both are defined to 0

The same fixes are required in ostree https://github.com/ostreedev/ostree/blob/main/src/libostree/ostree-fetcher-curl.c#L875-L887

@alexlarsson
Copy link
Member

lgtm. The use of CURLM_OK is a leftover from earlier code that didn't use the easy api. We could fix that, but as you say it doesn't really matter.

@alexlarsson alexlarsson merged commit 83b881c into flatpak:main Sep 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants