[libmicrohttpd] branch master updated (4e2f9fd9 -> 71c543f4)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 4e2f9fd9 Fixed compiler warnings for builds without Digest Auth
     new 07fa8f05 configure: warn if HTTP upgrade is disabled
     new 71c543f4 digestauth: fixed compiler warnings

The 2 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:
 configure.ac                |  1 +
 src/microhttpd/digestauth.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7633b06..e5eb86d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6064,6 +6064,7 @@ AS_IF([test "x$enable_bauth" != "xyes" || \
    test "x${USE_THREADS}" = "xnone" || \
    test "x$enable_httpupgrade" != "xyes" || \
    test "x$enable_cookie" != "xyes" || \
+   test "x$enable_httpupgrade" != "xyes" || \
    test "x$enable_postprocessor" != "xyes"],
    [AC_MSG_WARN([This will be a custom build with missing symbols. Do NOT use 
this build in a distribution. Building with these kinds of configure options is 
only for custom builds for embedded systems.])]
 )
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 277f98b1..05ca63f2 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -3545,9 +3545,10 @@ queue_auth_required_response3_inner (struct 
MHD_Connection *connection,
 #endif /* HAVE_MESSAGES */
     return MHD_NO;
   }
-  malgo3 &=
-    (enum MHD_DigestAuthMultiQOP)
-    (~((enum MHD_DigestAuthMultiQOP) MHD_DIGEST_AUTH_ALGO3_NON_SESSION));
+  malgo3 =
+    (enum MHD_DigestAuthMultiAlgo3)
+    (malgo3
+     & (~((enum MHD_DigestAuthMultiAlgo3) MHD_DIGEST_AUTH_ALGO3_NON_SESSION)));
 #ifdef MHD_MD5_SUPPORT
   if (0 != (((unsigned int) malgo3) & MHD_DIGEST_BASE_ALGO_MD5))
     s_algo = MHD_DIGEST_AUTH_ALGO3_MD5;
@@ -3580,8 +3581,10 @@ queue_auth_required_response3_inner (struct 
MHD_Connection *connection,
 
   if (MHD_DIGEST_AUTH_MULT_QOP_AUTH_INT == mqop)
     MHD_PANIC (_ ("Wrong 'mqop' value, API violation"));
-  mqop &= (enum MHD_DigestAuthMultiQOP)
-          (~((enum MHD_DigestAuthMultiQOP) MHD_DIGEST_AUTH_QOP_AUTH_INT));
+
+  mqop = (enum MHD_DigestAuthMultiQOP)
+         (mqop
+          & (~((enum MHD_DigestAuthMultiQOP) MHD_DIGEST_AUTH_QOP_AUTH_INT)));
 
   if (! digest_init_one_time (da, get_base_digest_algo (s_algo)))
     MHD_PANIC (_ ("Wrong 'algo' value, API violation"));

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