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

pull: If built with --disable-http2, allow enabling via http2=1 

We have a `http2=[0|1]` remote config option; let's have the
`--disable-http2` build option define the default for that.  This way
it's easy to still enable http2 for testing even if
we have it disabled by default.

Closes: #1798
Approved by: jlebon
This commit is contained in:
Colin Walters 2019-01-08 09:41:26 -05:00 committed by Atomic Bot
parent fa35ec38b7
commit 308d30d080
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,6 @@ initiate_next_curl_request (FetcherRequest *req,
* there are numerous HTTP/2 fixes since the original version in * there are numerous HTTP/2 fixes since the original version in
* libcurl 7.43.0. * libcurl 7.43.0.
*/ */
#ifdef BUILDOPT_HTTP2
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)
@ -789,7 +788,7 @@ initiate_next_curl_request (FetcherRequest *req,
curl_easy_setopt (req->easy, CURLOPT_PIPEWAIT, 1L); curl_easy_setopt (req->easy, CURLOPT_PIPEWAIT, 1L);
#endif #endif
} }
#endif
curl_easy_setopt (req->easy, CURLOPT_WRITEFUNCTION, write_cb); curl_easy_setopt (req->easy, CURLOPT_WRITEFUNCTION, write_cb);
if (g_getenv ("OSTREE_DEBUG_HTTP")) if (g_getenv ("OSTREE_DEBUG_HTTP"))
curl_easy_setopt (req->easy, CURLOPT_VERBOSE, 1L); curl_easy_setopt (req->easy, CURLOPT_VERBOSE, 1L);

9
src/libostree/ostree-repo-pull.c
View File

@ -2948,9 +2948,14 @@ _ostree_repo_remote_new_fetcher (OstreeRepo *self,
if (gzip) if (gzip)
fetcher_flags |= OSTREE_FETCHER_FLAGS_TRANSFER_GZIP; fetcher_flags |= OSTREE_FETCHER_FLAGS_TRANSFER_GZIP;
{ gboolean http2 = TRUE; { gboolean http2_default = TRUE;
#ifndef BUILDOPT_HTTP2
http2_default = FALSE;
#endif
gboolean http2;
if (!ostree_repo_get_remote_boolean_option (self, remote_name, if (!ostree_repo_get_remote_boolean_option (self, remote_name,
"http2", TRUE, "http2", http2_default,
&http2, error)) &http2, error))
goto out; goto out;
if (!http2) if (!http2)