[libmicrohttpd] branch master updated (c63be03c -> 83f50ffc)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from c63be03c calculate_nonce(): added comments, minor code corrections
     new b7e0c47e daemon: added missing cast, fixed regression introduced by 
25863e1c897b63eb56d248fde9634d0477ca8830
     new 83f50ffc digestauth: minor doxy correction for public API

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:
 src/include/microhttpd.h    |  9 +++++----
 src/microhttpd/daemon.c     |  2 +-
 src/microhttpd/digestauth.c | 13 +++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index d3765b6c..b2356e5a 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -5088,7 +5088,7 @@ enum MHD_DigestAuthResult
  *               returned;
  *               zero for no limit
  * @param mqop the QOP to use
- * @param malgo3 digest algorithms allowed to use, fail if algorithm specified
+ * @param malgo3 digest algorithms allowed to use, fail if algorithm used
  *               by the client is not allowed by this parameter
  * @return #MHD_DAUTH_OK if authenticated,
  *         the error code otherwise
@@ -5133,7 +5133,7 @@ MHD_digest_auth_check3 (struct MHD_Connection *connection,
  *               returned;
  *               zero for no limit
  * @param mqop the QOP to use
- * @param malgo3 digest algorithms allowed to use, fail if algorithm specified
+ * @param malgo3 digest algorithms allowed to use, fail if algorithm used
  *               by the client is not allowed by this parameter;
  *               both MD5-based and SHA-256-based algorithms cannot be used at
  *               the same time for this function as @a userdigest_size must
@@ -5193,8 +5193,9 @@ MHD_digest_auth_check_digest3 (struct MHD_Connection 
*connection,
  *                     to retry immediately with the new nonce and the same
  *                     credentials, without asking user for the new password
  * @param mqop the QOP to use
- * @param malgo3 digest algorithm to use, if several algorithms are specified
- *               then MD5 is used (if allowed)
+ * @param malgo3 digest algorithm to use, MHD selects; if several algorithms
+ *               are allowed then MD5 is preferred (currently, may be changed
+ *               in next versions)
  * @param userhash_support if set to non-zero value (#MHD_YES) then support of
  *                         userhash is indicated, the client may provide
  *                         hash("username:realm") instead of username in
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 6a92e733..3d96150d 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3684,7 +3684,7 @@ MHD_accept_connection (struct MHD_Daemon *daemon)
 
 #ifdef USE_ACCEPT4
   s = accept4 (fd,
-               &addrstorage,
+               (struct sockaddr *) &addrstorage,
                &addrlen,
                SOCK_CLOEXEC_OR_ZERO | SOCK_NONBLOCK_OR_ZERO
                | SOCK_NOSIGPIPE_OR_ZERO);
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c
index 1061512d..0f428d86 100644
--- a/src/microhttpd/digestauth.c
+++ b/src/microhttpd/digestauth.c
@@ -2660,7 +2660,7 @@ MHD_digest_auth_check (struct MHD_Connection *connection,
  *               returned;
  *               zero for no limit
  * @param mqop the QOP to use
- * @param malgo3 digest algorithms allowed to use, fail if algorithm specified
+ * @param malgo3 digest algorithms allowed to use, fail if algorithm used
  *               by the client is not allowed by this parameter
  * @return #MHD_DAUTH_OK if authenticated,
  *         the error code otherwise
@@ -2718,7 +2718,7 @@ MHD_digest_auth_check3 (struct MHD_Connection *connection,
  *               returned;
  *               zero for no limit
  * @param mqop the QOP to use
- * @param malgo3 digest algorithms allowed to use, fail if algorithm specified
+ * @param malgo3 digest algorithms allowed to use, fail if algorithm used
  *               by the client is not allowed by this parameter;
  *               both MD5-based and SHA-256-based algorithms cannot be used at
  *               the same time for this function as @a userdigest_size must
@@ -2934,8 +2934,8 @@ MHD_digest_auth_check_digest (struct MHD_Connection 
*connection,
  *               same authorisation could be used, URIs can be in form
  *               "path-absolute" (the path for the same host with initial 
slash)
  *               or in form "absolute-URI" (the full path with protocol), in
- *               any case client may assume that any URI which starts with
- *               any of specified URI is in the same "protection space";
+ *               any case client may assume that URI is in the same "protection
+ *               space" if it starts with any of values specified here;
  *               could be NULL (clients typically assume that the same
  *               credentials could be used for any URI on the same host)
  * @param response the reply to send; should contain the "access denied"
@@ -2947,8 +2947,9 @@ MHD_digest_auth_check_digest (struct MHD_Connection 
*connection,
  *                     to retry immediately with the new nonce and the same
  *                     credentials, without asking user for the new password
  * @param mqop the QOP to use
- * @param malgo3 digest algorithm to use, if several algorithms are specified
- *               then MD5 is used (if allowed)
+ * @param malgo3 digest algorithm to use, MHD selects; if several algorithms
+ *               are allowed then MD5 is preferred (currently, may be changed
+ *               in next versions)
  * @param userhash_support if set to non-zero value (#MHD_YES) then support of
  *                         userhash is indicated, the client may provide
  *                         hash("username:realm") instead of username in

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