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

[gnunet]

Author: Karlson2k
Date: 2016-04-14 12:24:58 +0200 (Thu, 14 Apr 2016)
New Revision: 37040

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Corrected pipes for worker thread for modes without MHD_USE_SUSPEND_RESUME

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-04-14 10:20:24 UTC (rev 
37039)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-04-14 10:24:58 UTC (rev 
37040)
@@ -4290,27 +4290,28 @@
           d->worker_pool_size = 0;
           d->worker_pool = NULL;
 
-          if ( (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) &&
-               (0 != MHD_pipe_ (d->wpipe)) )
+          if (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME))
             {
+              if (0 != MHD_pipe_ (d->wpipe))
+                {
 #ifdef HAVE_MESSAGES
-              MHD_DLOG (daemon,
-                        "Failed to create worker control pipe: %s\n",
-                        MHD_pipe_last_strerror_() );
+                  MHD_DLOG (daemon,
+                            "Failed to create worker control pipe: %s\n",
+                            MHD_pipe_last_strerror_() );
 #endif
-              goto thread_failed;
-            }
-          if (MHD_NO == make_nonblocking (d, d->wpipe[0]))
-            {
+                  goto thread_failed;
+                }
+              if (MHD_NO == make_nonblocking (d, d->wpipe[0]))
+                {
 #ifdef HAVE_MESSAGES
-              MHD_DLOG (daemon,
-                        "Failed to make worker control pipe non_blocking: 
%s\n",
-                        MHD_pipe_last_strerror_() );
+                  MHD_DLOG (daemon,
+                            "Failed to make worker control pipe non_blocking: 
%s\n",
+                            MHD_pipe_last_strerror_() );
 #endif
-
-              goto thread_failed;
+                  goto thread_failed;
+                }
+              make_nonblocking (d, d->wpipe[1]);
             }
-          make_nonblocking (d, d->wpipe[1]);
 #ifndef MHD_WINSOCK_SOCKETS
           if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) &&
                (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) &&