[libmicrohttpd] branch master updated (fc848aaf -> a7c91385)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from fc848aaf -typo
     new a0cb931f daemon: fixed compiler warning for non-TLS builds
     new a5504e36 response.c: fixed compiler warning on x32 platforms
     new f927a8c3 test_digestauth2: fixed test report strings
     new a7c91385 test_tricky: fixed reported error description

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/daemon.c         |  1 +
 src/microhttpd/response.c       |  2 ++
 src/testcurl/test_digestauth2.c | 12 ++++++------
 src/testcurl/test_tricky.c      |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 9a9367bd..c98e0b09 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6856,6 +6856,7 @@ parse_options_va (struct MHD_Daemon *daemon,
     case MHD_OPTION_HTTPS_MEM_CERT:
     case MHD_OPTION_HTTPS_CRED_TYPE:
     case MHD_OPTION_HTTPS_PRIORITIES:
+    case MHD_OPTION_HTTPS_PRIORITIES_APPEND:
     case MHD_OPTION_HTTPS_MEM_TRUST:
     case MHD_OPTION_HTTPS_CERT_CALLBACK:
     case MHD_OPTION_HTTPS_MEM_DHPARAMS:
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index b29f48f3..9cab223f 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -1634,8 +1634,10 @@ MHD_create_response_from_buffer_with_free_callback_cls 
(size_t size,
 
   if ((NULL == buffer) && (size > 0))
     return NULL;
+#if SIZEOF_SIZE_T >= SIZEOF_UINT64_T
   if (MHD_SIZE_UNKNOWN == size)
     return NULL;
+#endif /* SIZEOF_SIZE_T >= SIZEOF_UINT64_T */
   r = MHD_calloc_ (1, sizeof (struct MHD_Response));
   if (NULL == r)
     return NULL;
diff --git a/src/testcurl/test_digestauth2.c b/src/testcurl/test_digestauth2.c
index a1a2a700..9940d17c 100644
--- a/src/testcurl/test_digestauth2.c
+++ b/src/testcurl/test_digestauth2.c
@@ -1520,7 +1520,7 @@ main (int argc, char *const *argv)
   if ((CURL_VERSION_BITS (7,63,0) > curl_info->version_num) &&
       (CURL_VERSION_BITS (7,62,0) <= curl_info->version_num) )
   {
-    fprintf (stderr, "libcurl version 7.62.x has bug in processing"
+    fprintf (stderr, "libcurl version 7.62.x has bug in processing "
              "URI with GET arguments for Digest Auth.\n");
     fprintf (stderr, "This test with libcurl %u.%u.%u cannot be performed.\n",
              0xFF & (curl_info->version_num >> 16),
@@ -1552,9 +1552,9 @@ main (int argc, char *const *argv)
     }
     else if (CURL_VERSION_BITS (7,81,0) > curl_info->version_num)
     {
-      fprintf (stderr, "Required libcurl version 7.81.0 at least"
-               " to run this test with userhash.\n");
-      fprintf (stderr, "This libcurl version %u.%u.%u has broken digest"
+      fprintf (stderr, "Required libcurl at least version 7.81.0 "
+               "to run this test with userhash.\n");
+      fprintf (stderr, "This libcurl version %u.%u.%u has broken digest "
                "calculation when userhash is used.\n",
                0xFF & (curl_info->version_num >> 16),
                0xFF & (curl_info->version_num >> 8),
@@ -1576,8 +1576,8 @@ main (int argc, char *const *argv)
     }
     else if (CURL_VERSION_BITS (7,57,0) > curl_info->version_num)
     {
-      fprintf (stderr, "Required libcurl version 7.57.0 at least"
-               " to run this test with SHA-256.\n");
+      fprintf (stderr, "Required libcurl at least version 7.57.0 "
+               "to run this test with SHA-256.\n");
       fprintf (stderr, "This libcurl version %u.%u.%u "
                "does not support SHA-256.\n",
                0xFF & (curl_info->version_num >> 16),
diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c
index 50230bff..88ecff02 100644
--- a/src/testcurl/test_tricky.c
+++ b/src/testcurl/test_tricky.c
@@ -689,7 +689,7 @@ doCurlQueryInThread (struct MHD_Daemon *d,
     {
       if (CURLE_OPERATION_TIMEDOUT == errornum)
         mhdErrorExitDesc ("Request was aborted due to timeout");
-      fprintf (stderr, "libcurl returned expected error: %s\n",
+      fprintf (stderr, "libcurl returned unexpected error: %s\n",
                curl_easy_strerror (errornum));
       mhdErrorExitDesc ("Request failed due to unexpected error");
     }

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