flatpak-utils-http.c (flatpak-1.15.2.tar.xz) | : | flatpak-utils-http.c (flatpak-1.15.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 375 | skipping to change at line 375 | |||
FlatpakHttpSession *session = g_new0 (FlatpakHttpSession, 1); | FlatpakHttpSession *session = g_new0 (FlatpakHttpSession, 1); | |||
CURLcode rc; | CURLcode rc; | |||
CURL *curl; | CURL *curl; | |||
session->curl = curl = curl_easy_init(); | session->curl = curl = curl_easy_init(); | |||
g_assert (session->curl != NULL); | g_assert (session->curl != NULL); | |||
g_mutex_init (&session->lock); | g_mutex_init (&session->lock); | |||
curl_easy_setopt (curl, CURLOPT_USERAGENT, user_agent); | curl_easy_setopt (curl, CURLOPT_USERAGENT, user_agent); | |||
#if CURL_AT_LEAST_VERSION(7, 85, 0) | ||||
rc = curl_easy_setopt (curl, CURLOPT_PROTOCOLS_STR, "http,https"); | ||||
#else | ||||
rc = curl_easy_setopt (curl, CURLOPT_PROTOCOLS, (long)(CURLPROTO_HTTP | CURLPR OTO_HTTPS)); | rc = curl_easy_setopt (curl, CURLOPT_PROTOCOLS, (long)(CURLPROTO_HTTP | CURLPR OTO_HTTPS)); | |||
#endif | ||||
g_assert_cmpint (rc, ==, CURLM_OK); | g_assert_cmpint (rc, ==, CURLM_OK); | |||
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); | curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); | |||
/* Note: curl automatically respects the http_proxy env var */ | /* Note: curl automatically respects the http_proxy env var */ | |||
if (g_getenv ("OSTREE_DEBUG_HTTP")) | if (g_getenv ("OSTREE_DEBUG_HTTP")) | |||
curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L); | curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L); | |||
/* Picked the current version in F25 as of 20170127, since | /* Picked the current version in F25 as of 20170127, since | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added |