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

lib/fetcher: Add version to USER_AGENT string 

This came up in allowing Fedora infrastructure to work around a libcurl bug with
HTTP2: https://pagure.io/atomic-wg/issue/405

Closes: https://github.com/ostreedev/ostree/issues/1405

Closes: #1406
Approved by: jlebon
This commit is contained in:
Colin Walters 2018-01-10 16:02:59 -05:00 committed by Atomic Bot
parent 0be95ded99
commit fdf7e2c560
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,7 +714,7 @@ initiate_next_curl_request (FetcherRequest *req,
curl_easy_setopt (req->easy, CURLOPT_URL, uri); curl_easy_setopt (req->easy, CURLOPT_URL, uri);
} }
curl_easy_setopt (req->easy, CURLOPT_USERAGENT, "ostree "); curl_easy_setopt (req->easy, CURLOPT_USERAGENT, OSTREE_FETCHER_USERAGENT_STRING);
if (self->extra_headers) if (self->extra_headers)
curl_easy_setopt (req->easy, CURLOPT_HTTPHEADER, self->extra_headers); curl_easy_setopt (req->easy, CURLOPT_HTTPHEADER, self->extra_headers);

2
src/libostree/ostree-fetcher-soup.c
View File

@ -479,7 +479,7 @@ ostree_fetcher_session_thread (gpointer data)
g_main_context_push_thread_default (mainctx); g_main_context_push_thread_default (mainctx);
/* We retain ownership of the SoupSession reference. */ /* We retain ownership of the SoupSession reference. */
closure->session = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, "ostree ", closure->session = soup_session_async_new_with_options (SOUP_SESSION_USER_AGENT, OSTREE_FETCHER_USERAGENT_STRING,
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
SOUP_SESSION_USE_THREAD_CONTEXT, TRUE, SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_REQUESTER, SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_REQUESTER,

6
src/libostree/ostree-fetcher-util.h
View File

@ -25,6 +25,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
/* We used to only send "ostree/" but now include the version
* https://github.com/ostreedev/ostree/issues/1405
* This came up in allowing Fedora infrastructure to work around a libcurl bug with HTTP2.
*/
#define OSTREE_FETCHER_USERAGENT_STRING (PACKAGE_NAME "/" PACKAGE_VERSION)
static inline gboolean static inline gboolean
_ostree_fetcher_tmpf_from_flags (OstreeFetcherRequestFlags flags, _ostree_fetcher_tmpf_from_flags (OstreeFetcherRequestFlags flags,
int dfd, int dfd,