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

[gnunet]

Author: grothoff
Date: 2014-02-12 17:38:18 +0100 (Wed, 12 Feb 2014)
New Revision: 32328

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
From: Karlson2k <address@hidden>
Date: Wed, 12 Feb 2014 17:34:05 +0400
Subject: [PATCH] MHD_accept_connection small refactoring: choose at compile
 time instead of run time



Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2014-02-12 16:36:42 UTC (rev 
32327)
+++ libmicrohttpd/src/microhttpd/daemon.c       2014-02-12 16:38:18 UTC (rev 
32328)
@@ -609,7 +609,7 @@
       if (daemon->epoll_fd >= FD_SETSIZE)
        return MHD_NO; /* poll fd too big, fail hard */
       FD_SET (daemon->epoll_fd, read_fd_set);
-      if ( (NULL != max_fd) && (*max_fd) < daemon->epoll_fd) )
+      if ( (NULL != max_fd) &&  ((*max_fd) < daemon->epoll_fd) )
        *max_fd = daemon->epoll_fd;
       return MHD_YES;
     }
@@ -1736,8 +1736,9 @@
         }
       return MHD_NO;
     }
-  if ( (! HAVE_ACCEPT4) || (0 == SOCK_CLOEXEC) )
-    make_nonblocking_noninheritable (daemon, s);
+#if !defined(HAVE_ACCEPT4) || SOCK_CLOEXEC+0 == 0
+  make_nonblocking_noninheritable (daemon, s);
+#endif
 #if HAVE_MESSAGES
 #if DEBUG_CONNECT
   MHD_DLOG (daemon, "Accepted connection on socket %d\n", s);