packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2706 from git-bruh/main 

ostree-fetcher-curl: check for HTTP2 support before trying to use it
This commit is contained in:
Luca Bruno 2022-09-05 09:29:29 +00:00 committed by GitHub
parent eed9e9f335 35d6ea88f6
commit fdbc05dab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libostree/ostree-fetcher-curl.c
View File

@ -882,8 +882,10 @@ initiate_next_curl_request (FetcherRequest *req,
if (!(self->config_flags & OSTREE_FETCHER_FLAGS_DISABLE_HTTP2)) if (!(self->config_flags & OSTREE_FETCHER_FLAGS_DISABLE_HTTP2))
{ {
#if CURL_AT_LEAST_VERSION(7, 51, 0) #if CURL_AT_LEAST_VERSION(7, 51, 0)
rc = curl_easy_setopt (req->easy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0); if ((curl_version_info (CURLVERSION_NOW))->features & CURL_VERSION_HTTP2) {
g_assert_cmpint (rc, ==, CURLM_OK); rc = curl_easy_setopt (req->easy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
g_assert_cmpint (rc, ==, CURLM_OK);
}
#endif #endif
/* https://github.com/curl/curl/blob/curl-7_53_0/docs/examples/http2-download.c */ /* https://github.com/curl/curl/blob/curl-7_53_0/docs/examples/http2-download.c */
#if (CURLPIPE_MULTIPLEX > 0) #if (CURLPIPE_MULTIPLEX > 0)