[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 92a6b87757fbd9420afcd24d7fcf0d0f1792c337

[gitolite]

The branch, master has been updated
       via  92a6b87757fbd9420afcd24d7fcf0d0f1792c337 (commit)
       via  1890d51a8cc73b8b0b9fd3554f18f612ab7f6056 (commit)
       via  7b1b32c6a47b9751c44e90820d420781a95b7631 (commit)
      from  f4a6e110acd20459f359854c05ba6b43e7cb8dad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 92a6b87757fbd9420afcd24d7fcf0d0f1792c337
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 24 17:59:53 2016 +0300

    MHD_start_daemon_va(): fixed wrong check caused daemon failure on some 
platforms

commit 1890d51a8cc73b8b0b9fd3554f18f612ab7f6056
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 24 16:32:03 2016 +0300

    configure.ac: rewritten test for lib magic.

commit 7b1b32c6a47b9751c44e90820d420781a95b7631
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Thu Nov 24 15:55:23 2016 +0300

    test_upgrade.c: fixed compatibility with older GnuTLS

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                  | 11 +++++------
 src/microhttpd/daemon.c       |  2 +-
 src/microhttpd/test_upgrade.c |  6 +++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 635f788..2d8a6a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1032,13 +1032,12 @@ then
 fi
 AM_CONDITIONAL([HAVE_CURL], [test "x$enable_curl" = "xyes"])
 
-AC_CHECK_LIB([[magic]], [[magic_open]],
-  [AC_CHECK_HEADERS([magic.h], [
-     AM_CONDITIONAL(HAVE_MAGIC, true),
-     AM_CONDITIONAL(HAVE_MAGIC, false)]
-     ,[] ,[AC_INCLUDES_DEFAULT])
-  ], [AM_CONDITIONAL(HAVE_MAGIC, false)])
+mhd_have_magic_open='no'
+AC_CHECK_HEADERS([[magic.h]],
+  [ AC_CHECK_LIB([[magic]], [[magic_open]], [[mhd_have_magic_open='yes']]) 
],[],
+  [AC_INCLUDES_DEFAULT])
 
+AM_CONDITIONAL([HAVE_MAGIC], [[test "x$mhd_have_magic_open" = "xyes"]])
 
 # large file support (> 4 GB)
 AC_SYS_LARGEFILE
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 91e281e..6e97085 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5383,7 +5383,7 @@ MHD_start_daemon_va (unsigned int flags,
                 }
             }
           if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL))) &&
-               (! MHD_SCKT_FD_FITS_FDSET_(MHD_itc_r_fd_ (daemon->itc),
+               (! MHD_SCKT_FD_FITS_FDSET_(MHD_itc_r_fd_ (d->itc),
                                           NULL)) )
             {
 #ifdef HAVE_MESSAGES
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 0af8cfd..68ff20d 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -238,7 +238,11 @@ static wr_socket wr_create_tls_sckt(void)
                 {
                   if (GNUTLS_E_SUCCESS == gnutls_credentials_set (s->tls_s, 
GNUTLS_CRD_CERTIFICATE, s->tls_crd))
                     {
-                      gnutls_transport_set_int (s->tls_s, (int )(s->fd));
+#if GNUTLS_VERSION_NUMBER+0 >= 0x030109
+                      gnutls_transport_set_int (s->tls_s, (int)(s->fd));
+#else  /* GnuTLS before 3.1.9 */
+                      gnutls_transport_set_ptr (s->tls_s, 
(gnutls_transport_ptr_t)(intptr_t)(s->fd));
+#endif /* GnuTLS before 3.1.9 */
                       return s;
                     }
                   gnutls_certificate_free_credentials (s->tls_crd);


hooks/post-receive
-- 
GNU libmicrohttpd