about summary refs log tree commit diff
path: root/src/nm-cloud-setup
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2023-01-26 16:56:49 -0500
committerJeremy Bicha <jeremy.bicha@canonical.com>2023-01-26 16:56:49 -0500
commitb37cf412cae342684b4ab3709a1b8aaef728cada (patch)
tree7601e9fc1c7f7c9c66178b8ab22c768342676198 /src/nm-cloud-setup
parent4b928cbbf5f92da2ee2f9fce687310f2a95d9c43 (diff)
parent2c1b7a7ea3c332b4d690c0595ef76c81de1f0cc8 (diff)
Merge tag 'debian/1.40.12-1' into ubuntu/master
network-manager Debian release 1.40.12-1
Diffstat (limited to 'src/nm-cloud-setup')
-rw-r--r--src/nm-cloud-setup/nm-http-client.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nm-cloud-setup/nm-http-client.c b/src/nm-cloud-setup/nm-http-client.c
index a0053d47..a0964e21 100644
--- a/src/nm-cloud-setup/nm-http-client.c
+++ b/src/nm-cloud-setup/nm-http-client.c
@@ -305,7 +305,12 @@ nm_http_client_get(NMHttpClient       *self,
     curl_easy_setopt(edata->ehandle, CURLOPT_WRITEFUNCTION, _get_writefunction_cb);
     curl_easy_setopt(edata->ehandle, CURLOPT_WRITEDATA, edata);
     curl_easy_setopt(edata->ehandle, CURLOPT_PRIVATE, edata);
+
+#if LIBCURL_VERSION_NUM >= 0x075500 /* libcurl 7.85.0 */
+    curl_easy_setopt(edata->ehandle, CURLOPT_PROTOCOLS_STR, "HTTP,HTTPS");
+#else
     curl_easy_setopt(edata->ehandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+#endif
 
     if (http_headers) {
         for (i = 0; http_headers[i]; ++i) {