[monitoring-plugins] using CURLOPT_REDIR_PROTOCOLS_STR instead of ...

Andreas Baumann git at monitoring-plugins.org
Sun Feb 5 20:40:11 CET 2023


 Module: monitoring-plugins
 Branch: curlfixes
 Commit: 53f07a468db98247dc4012de0ee678f29cc2bfec
 Author: Andreas Baumann <mail at andreasbaumann.cc>
   Date: Sun Feb  5 20:34:41 2023 +0100
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=53f07a4

using CURLOPT_REDIR_PROTOCOLS_STR instead of CURLOPT_REDIR_PROTOCOLS for curl >= 7.85.0

---

 plugins/check_curl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index c6593df..7916eb5 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -688,9 +688,13 @@ check_http (void)
       handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_MAXREDIRS, max_depth+1), "CURLOPT_MAXREDIRS");
 
       /* for now allow only http and https (we are a http(s) check plugin in the end) */
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
+      handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"), "CURLOPT_REDIR_PROTOCOLS_STR");
+#else
 #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
       handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS), "CURLOPT_REDIRECT_PROTOCOLS");
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4) */
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 4) */
 
       /* TODO: handle the following aspects of redirection, make them
        * command line options too later:



More information about the Commits mailing list