about summary refs log tree commit diff
path: root/src/core/nm-connectivity.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2023-01-26 21:57:17 +0100
committerMichael Biebl <biebl@debian.org>2023-01-26 21:57:17 +0100
commitf8b5aa96b4370d88f38699433cec6e7a26a410f1 (patch)
tree1817c96b86eac7fb93125a52d6b6d31f6a4bad45 /src/core/nm-connectivity.c
parentb0529444cb9c40efb19c7b4d4fe8da86ebcc7bdb (diff)
parent2c1b7a7ea3c332b4d690c0595ef76c81de1f0cc8 (diff)
Merge tag 'debian/1.40.12-1' into debian/bullseye-backports
network-manager Debian release 1.40.12-1
Diffstat (limited to 'src/core/nm-connectivity.c')
-rw-r--r--src/core/nm-connectivity.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
index cd30853d..c0e77e35 100644
--- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
@@ -767,7 +767,13 @@ do_curl_request(NMConnectivityCheckHandle *cb_data, const char *hosts)
     curl_easy_setopt(ehandle, CURLOPT_INTERFACE, cb_data->ifspec);
     curl_easy_setopt(ehandle, CURLOPT_RESOLVE, cb_data->concheck.hosts);
     curl_easy_setopt(ehandle, CURLOPT_IPRESOLVE, resolve);
+
+#if LIBCURL_VERSION_NUM >= 0x075500 /* libcurl 7.85.0 */
+    curl_easy_setopt(ehandle, CURLOPT_PROTOCOLS_STR, "HTTP,HTTPS");
+#else
     curl_easy_setopt(ehandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+#endif
+
     if (_LOGT_ENABLED() && easy_debug_enabled()) {
         curl_easy_setopt(ehandle, CURLOPT_DEBUGFUNCTION, easy_debug_cb);
         curl_easy_setopt(ehandle, CURLOPT_DEBUGDATA, cb_data);