[libmicrohttpd] branch master updated: zzuf tests: fixed compiler warnings

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new a030a4ae zzuf tests: fixed compiler warnings
a030a4ae is described below

commit a030a4aef7b73e35a836a26dae69cf146db28628
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Wed Sep 27 09:28:50 2023 +0300

    zzuf tests: fixed compiler warnings
---
 src/testzzuf/test_get.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c
index 276b1a5a..737e5cf0 100644
--- a/src/testzzuf/test_get.c
+++ b/src/testzzuf/test_get.c
@@ -1024,10 +1024,6 @@ setupCURL (struct CBC *cbc, uint16_t port
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_WRITEDATA, cbc))) &&
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_CONNECTTIMEOUT,
                                           ((long) CURL_TIMEOUT)))) &&
-      (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
-                                          oneone ?
-                                          CURL_HTTP_VERSION_1_1 :
-                                          CURL_HTTP_VERSION_1_0))) &&
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_TIMEOUT,
                                           ((long) CURL_TIMEOUT)))) &&
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_FAILONERROR, 0L))) &&
@@ -1038,14 +1034,21 @@ setupCURL (struct CBC *cbc, uint16_t port
                                           &libcurl_debug_cb))) &&
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_DEBUGDATA,
                                           cbc))) &&
-#if CURL_AT_LEAST_VERSION (7, 19, 4)
+#if CURL_AT_LEAST_VERSION (7, 45, 0)
+      (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_DEFAULT_PROTOCOL,
+                                          "http"))) &&
+#endif /* CURL_AT_LEAST_VERSION (7, 45, 0) */
+#if CURL_AT_LEAST_VERSION (7, 85, 0)
+      (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_PROTOCOLS_STR,
+                                          "http"))) &&
+#elif CURL_AT_LEAST_VERSION (7, 19, 4)
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_PROTOCOLS,
                                           CURLPROTO_HTTP))) &&
 #endif /* CURL_AT_LEAST_VERSION (7, 19, 4) */
-#if CURL_AT_LEAST_VERSION (7, 45, 0)
-      (CURLE_OK == (e = curl_easy_setopt (c,
-                                          CURLOPT_DEFAULT_PROTOCOL, "http"))) 
&&
-#endif /* CURL_AT_LEAST_VERSION (7, 45, 0) */
+      (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_HTTP_VERSION,
+                                          oneone ?
+                                          CURL_HTTP_VERSION_1_1 :
+                                          CURL_HTTP_VERSION_1_0))) &&
 #if CURL_AT_LEAST_VERSION (7, 24, 0)
       (CURLE_OK == (e = curl_easy_setopt (c, CURLOPT_INTERFACE,
                                           "host!127.0.0.101"))) &&

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.