Mercurial > irccd
changeset 1194:683f9a8b3085
misc: minor touches before 4.1.0
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 03 Aug 2023 21:19:44 +0200 |
| parents | bb5a6e5326f3 |
| children | c6b5bf592252 |
| files | CMakeLists.txt irccd/jsapi-http.c |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Mar 20 16:53:09 2023 +0100 +++ b/CMakeLists.txt Thu Aug 03 21:19:44 2023 +0200 @@ -63,7 +63,7 @@ option(IRCCD_WITH_SSL "Enable SSL (requires OpenSSL)" On) option(IRCCD_WITH_TESTS "Enable unit tests" On) -set(IRCCD_MAN_DATE "February 7, 2022") +set(IRCCD_MAN_DATE "August 3, 2023") set(IRCCD_WITH_UID "irccd" CACHE STRING "Default uid to run irccd as") set(IRCCD_WITH_GID "irccd" CACHE STRING "Default gid to run irccd as") set(IRCCD_WITH_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
--- a/irccd/jsapi-http.c Mon Mar 20 16:53:09 2023 +0100 +++ b/irccd/jsapi-http.c Thu Aug 03 21:19:44 2023 +0200 @@ -102,12 +102,17 @@ goto enomem; curl_easy_setopt(op->curl, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt(op->curl, CURLOPT_PROTOCOLS, - CURLPROTO_HTTP | CURLPROTO_HTTPS); curl_easy_setopt(op->curl, CURLOPT_WRITEFUNCTION, op_write); curl_easy_setopt(op->curl, CURLOPT_WRITEDATA, op); curl_easy_setopt(op->curl, CURLOPT_FOLLOWLOCATION, 1L); + /* CURLOPT_PROTOCOLS is deprecated since 7.85.0. */ +#if LIBCURL_VERSION_MAJOR >= 8 || (LIBCURL_VERSION_MAJOR >= 7 && LIBCURL_VERSION_MINOR >= 85) + curl_easy_setopt(op->curl, CURLOPT_PROTOCOLS_STR, "http,https"); +#else + curl_easy_setopt(op->curl, CURLOPT_PROTOCOLS_STR, (long)CURLPROTO_HTTP | CURLPROTO_HTTPS); +#endif + return op; enomem: