[libmicrohttpd] branch master updated (5e3862d6 -> 50067864)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 5e3862d6 internal.h: fixed typo in comment, updated copyright
     new cc2d26ef configure: check whether leak detection is supported
     new 1a174406 Muted sanitizer errors on W32 platform.
     new 6acc44c9 test_upgrade{,_large}.c: fixed portability
     new 50067864 configure: removed "-fno-common" for sanitizers as it's not 
used by MHD

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:
 configure.ac                                | 24 ++++++++++++++++++++++--
 src/examples/upgrade_example.c              |  2 +-
 src/examples/websocket_chatserver_example.c |  2 +-
 src/examples/websocket_threaded_example.c   |  2 +-
 src/microhttpd/mhd_sockets.c                |  8 ++++----
 src/microhttpd/test_shutdown_select.c       |  2 +-
 src/microhttpd/test_upgrade.c               |  4 ++--
 src/microhttpd/test_upgrade_large.c         |  4 ++--
 8 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index bd6bd899..bdf4ac93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2609,6 +2609,9 @@ AM_TESTS_ENVIRONMENT=""
 AM_ASAN_OPTIONS=""
 AM_UBSAN_OPTIONS=""
 AM_LSAN_OPTIONS=""
+AS_UNSET([ASAN_OPTIONS])
+AS_UNSET([UBSAN_OPTIONS])
+AS_UNSET([LSAN_OPTIONS])
 AC_ARG_ENABLE([sanitizers],
   [AS_HELP_STRING([--enable-sanitizers], [enable run-time sanitizers])],
   [], [enable_sanitizers=no])
@@ -2638,6 +2641,21 @@ AS_VAR_IF([enable_sanitizers], ["yes"],
          [
            AX_APPEND_FLAG([-fsanitize=address], [san_FLAGS])
            enabled_sanitizers="${enabled_sanitizers}${enabled_sanitizers:+, 
}address"
+           AC_CACHE_CHECK([whether leak detect is supported], 
[mhd_cv_cc_sanitizer_address_leak],
+             [
+               CFLAGS="${saved_CFLAGS} ${san_CFLAGS} ${san_FLAGS}"
+               ASAN_OPTIONS="exitcode=88:detect_leaks=1:halt_on_error=1"
+               export ASAN_OPTIONS
+               AC_RUN_IFELSE([AC_LANG_PROGRAM([],[])],
+                 [mhd_cv_cc_sanitizer_address_leak=yes], 
[mhd_cv_cc_sanitizer_address_leak=no],
+                 [
+                   # Cross-compiling with sanitizers?
+                   mhd_cv_cc_sanitizer_address_leak=yes
+                 ]
+               )
+               AS_UNSET([ASAN_OPTIONS])
+             ]
+           )
            AC_CACHE_CHECK([for pointer compare sanitizer], 
[mhd_cv_cc_sanitizer_pointer_compare],
              [
                CFLAGS="${saved_CFLAGS} ${san_CFLAGS} ${san_FLAGS} 
-fsanitize=pointer-compare"
@@ -2797,12 +2815,14 @@ int main(void)
        CFLAGS="${saved_CFLAGS} ${san_FLAGS} ${san_CFLAGS}"
        AX_APPEND_COMPILE_FLAGS([-fno-sanitize-recover=all], [san_CFLAGS])
        # Get better output for sanitizers error reporting
-       AX_APPEND_COMPILE_FLAGS([-fno-omit-frame-pointer -fno-common 
-fno-optimize-sibling-calls],
+       AX_APPEND_COMPILE_FLAGS([-fno-omit-frame-pointer 
-fno-optimize-sibling-calls],
          [san_CFLAGS])
-       
AM_ASAN_OPTIONS="exitcode=88:detect_leaks=1:strict_string_checks=1:detect_stack_use_after_return=1"
+       
AM_ASAN_OPTIONS="exitcode=88:strict_string_checks=1:detect_stack_use_after_return=1"
        
AM_ASAN_OPTIONS="${AM_ASAN_OPTIONS}:check_initialization_order=1:strict_init_order=1:redzone=64"
        
AM_ASAN_OPTIONS="${AM_ASAN_OPTIONS}:max_free_fill_size=1024:detect_invalid_pointer_pairs=3"
        AM_ASAN_OPTIONS="${AM_ASAN_OPTIONS}:handle_ioctl=1:halt_on_error=1"
+       AS_VAR_IF([mhd_cv_cc_sanitizer_address_leak], ["yes"],
+         [AM_ASAN_OPTIONS="${AM_ASAN_OPTIONS}:detect_leaks=1"])
        AM_UBSAN_OPTIONS="exitcode=87:print_stacktrace=1:halt_on_error=1"
        AM_LSAN_OPTIONS="use_unaligned=1"
        AM_TESTS_ENVIRONMENT='\
diff --git a/src/examples/upgrade_example.c b/src/examples/upgrade_example.c
index 85a06646..b0cc869d 100644
--- a/src/examples/upgrade_example.c
+++ b/src/examples/upgrade_example.c
@@ -57,7 +57,7 @@ make_blocking (MHD_socket fd)
 #elif defined(MHD_WINSOCK_SOCKETS)
   unsigned long flags = 1;
 
-  ioctlsocket (fd, FIONBIO, &flags);
+  ioctlsocket (fd, (int) FIONBIO, &flags);
 #endif /* MHD_WINSOCK_SOCKETS */
 
 }
diff --git a/src/examples/websocket_chatserver_example.c 
b/src/examples/websocket_chatserver_example.c
index 08c86192..701684cc 100644
--- a/src/examples/websocket_chatserver_example.c
+++ b/src/examples/websocket_chatserver_example.c
@@ -708,7 +708,7 @@ make_blocking (MHD_socket fd)
 #elif defined(MHD_WINSOCK_SOCKETS)
   unsigned long flags = 0;
 
-  ioctlsocket (fd, FIONBIO, &flags);
+  ioctlsocket (fd, (int) FIONBIO, &flags);
 #endif /* MHD_WINSOCK_SOCKETS */
 
 }
diff --git a/src/examples/websocket_threaded_example.c 
b/src/examples/websocket_threaded_example.c
index cfb7d750..1586933e 100644
--- a/src/examples/websocket_threaded_example.c
+++ b/src/examples/websocket_threaded_example.c
@@ -526,7 +526,7 @@ make_blocking (MHD_socket fd)
 #elif defined(MHD_WINSOCK_SOCKETS)
   unsigned long flags = 1;
 
-  ioctlsocket (fd, FIONBIO, &flags);
+  ioctlsocket (fd, (int) FIONBIO, &flags);
 #endif /* MHD_WINSOCK_SOCKETS */
 }
 
diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
index aae8a496..0d9826a4 100644
--- a/src/microhttpd/mhd_sockets.c
+++ b/src/microhttpd/mhd_sockets.c
@@ -294,7 +294,7 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
       }
 
       if ( (0 != ioctlsocket (client_s,
-                              FIONBIO,
+                              (int) FIONBIO,
                               &on_val)) ||
            ( (0 != connect (client_s,
                             (struct sockaddr*) &listen_addr,
@@ -329,10 +329,10 @@ MHD_W32_socket_pair_ (SOCKET sockets_pair[2], int non_blk)
             client_addr.sin_addr.s_addr) &&
            ( (0 != non_blk) ?
              (0 == ioctlsocket (server_s,
-                                FIONBIO,
+                                (int) FIONBIO,
                                 &on_val)) :
              (0 == ioctlsocket (client_s,
-                                FIONBIO,
+                                (int) FIONBIO,
                                 &off_val)) ) )
       {
         closesocket (listen_s);
@@ -417,7 +417,7 @@ MHD_socket_nonblocking_ (MHD_socket sock)
   unsigned long flags = 1;
 
   if (0 != ioctlsocket (sock,
-                        FIONBIO,
+                        (int) FIONBIO,
                         &flags))
     return 0;
 #endif /* MHD_WINSOCK_SOCKETS */
diff --git a/src/microhttpd/test_shutdown_select.c 
b/src/microhttpd/test_shutdown_select.c
index 08b30426..0841589c 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -187,7 +187,7 @@ start_socket_listen (int domain)
   }
 
 #ifdef MHD_WINSOCK_SOCKETS
-  if (0 != ioctlsocket (fd, FIONBIO, &flags))
+  if (0 != ioctlsocket (fd, (int) FIONBIO, &flags))
   {
     fprintf (stderr, "Failed to make socket non-blocking: %u\n",
              (unsigned) sock_errno);
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index c5eb43c8..b41a5561 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -571,7 +571,7 @@ make_blocking (MHD_socket fd)
 #elif defined(MHD_WINSOCK_SOCKETS)
   unsigned long flags = 1;
 
-  ioctlsocket (fd, FIONBIO, &flags);
+  ioctlsocket (fd, (int) FIONBIO, &flags);
 #endif /* MHD_WINSOCK_SOCKETS */
 
 }
@@ -898,7 +898,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
     FD_ZERO (&rs);
     FD_ZERO (&ws);
     FD_ZERO (&es);
-    max_fd = -1;
+    max_fd = MHD_INVALID_SOCKET;
     to = 1000;
 
     if (MHD_YES !=
diff --git a/src/microhttpd/test_upgrade_large.c 
b/src/microhttpd/test_upgrade_large.c
index de0626c8..4c54905d 100644
--- a/src/microhttpd/test_upgrade_large.c
+++ b/src/microhttpd/test_upgrade_large.c
@@ -745,7 +745,7 @@ make_blocking (MHD_socket fd)
 #elif defined(MHD_WINSOCK_SOCKETS)
   unsigned long flags = 1;
 
-  ioctlsocket (fd, FIONBIO, &flags);
+  ioctlsocket (fd, (int) FIONBIO, &flags);
 #endif /* MHD_WINSOCK_SOCKETS */
 }
 
@@ -1085,7 +1085,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
     FD_ZERO (&rs);
     FD_ZERO (&ws);
     FD_ZERO (&es);
-    max_fd = -1;
+    max_fd = MHD_INVALID_SOCKET;
     to = 1000;
 
     FD_SET (MHD_itc_r_fd_ (kicker), &rs);

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