1 files changed, 14 insertions, 1 deletions

diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 0fa51260..71d069ec 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -1073,10 +1073,23 @@ MHD_add_connection (struct MHD_Daemon *daemon,
           return MHD_NO;
         }
     }
-  /* FIXME: race with removal operation! */
+  if (0 != pthread_mutex_lock(&daemon->cleanup_connection_mutex))
+    {
+#if HAVE_MESSAGES
+      MHD_DLOG (daemon, "Failed to acquire cleanup mutex\n");
+#endif
+      abort();
+    }
   DLL_insert (daemon->connections_head,
               daemon->connections_tail,
               connection);
+  if (0 != pthread_mutex_unlock(&daemon->cleanup_connection_mutex))
+    {
+#if HAVE_MESSAGES
+      MHD_DLOG (daemon, "Failed to release cleanup mutex\n");
+#endif
+      abort();
+    }
   daemon->max_connections--;
   return MHD_YES;  
 }