[libmicrohttpd] branch master updated: proposed fix for #6116

[gnunet]

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

grothoff pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 70781455 proposed fix for #6116
70781455 is described below

commit 7078145599b9d3b77b361de2797d704e9346fb5d
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Mar 10 21:11:06 2020 +0100

    proposed fix for #6116
---
 src/microhttpd/daemon.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 77ac1f87..4f7c2108 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6404,22 +6404,18 @@ MHD_start_daemon_va (unsigned int flags,
       MHD_socket_close_chk_ (listen_fd);
     goto free_and_fail;
   }
-  if (0 == daemon->worker_pool_size)
-  {   /* Initialise connection mutex only if this daemon will handle
-       * any connections by itself. */
-    if (! MHD_mutex_init_ (&daemon->cleanup_connection_mutex))
-    {
+  if (! MHD_mutex_init_ (&daemon->cleanup_connection_mutex))
+  {
 #ifdef HAVE_MESSAGES
-      MHD_DLOG (daemon,
-                _ ("MHD failed to initialize IP connection limit mutex\n"));
+    MHD_DLOG (daemon,
+              _ ("MHD failed to initialize IP connection limit mutex\n"));
 #endif
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
-      MHD_mutex_destroy_chk_ (&daemon->cleanup_connection_mutex);
+    MHD_mutex_destroy_chk_ (&daemon->cleanup_connection_mutex);
 #endif
-      if (MHD_INVALID_SOCKET != listen_fd)
-        MHD_socket_close_chk_ (listen_fd);
-      goto free_and_fail;
-    }
+    if (MHD_INVALID_SOCKET != listen_fd)
+      MHD_socket_close_chk_ (listen_fd);
+    goto free_and_fail;
   }
 #endif
 
@@ -6435,8 +6431,7 @@ MHD_start_daemon_va (unsigned int flags,
     if (MHD_INVALID_SOCKET != listen_fd)
       MHD_socket_close_chk_ (listen_fd);
 #if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
-    if (0 == daemon->worker_pool_size)
-      MHD_mutex_destroy_chk_ (&daemon->cleanup_connection_mutex);
+    MHD_mutex_destroy_chk_ (&daemon->cleanup_connection_mutex);
     MHD_mutex_destroy_chk_ (&daemon->per_ip_connection_mutex);
 #endif
     goto free_and_fail;

-- 
To stop receiving notification emails like this one, please contact
address@hidden.