[GNUnet-SVN] r36825 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2016-01-17 17:55:25 +0100 (Sun, 17 Jan 2016)
New Revision: 36825

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
make_nonblocking_noninheritable(): fixed checking for current non-blocking 
flags,
improved error report.

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-01-17 16:25:58 UTC (rev 
36824)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-01-17 16:55:25 UTC (rev 
36825)
@@ -1878,12 +1878,13 @@
 #endif
   flags = fcntl (sock, F_GETFD);
   if ( ( (-1 == flags) ||
-        ( (flags != (flags | FD_CLOEXEC)) &&
+        ( (flags != (flags | nonblock | FD_CLOEXEC)) &&
           (0 != fcntl (sock, F_SETFD, flags | nonblock | FD_CLOEXEC)) ) ) )
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
-               "Failed to make socket non-inheritable: %s\n",
+               "Failed to make socket %snon-inheritable: %s\n",
+        ((nonblock) ? "non-blocking " : ""),
                MHD_socket_last_strerr_ ());
 #endif
     }