aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 88dabed5..2f8945c1 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2962,7 +2962,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
2962 2962
2963 if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && 2963 if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
2964 (! pos->thread_joined) && 2964 (! pos->thread_joined) &&
2965 (! MHD_join_thread_ (pos->pid)) ) 2965 (! MHD_join_thread_ (pos->pid.handle)) )
2966 MHD_PANIC (_("Failed to join a thread\n")); 2966 MHD_PANIC (_("Failed to join a thread\n"));
2967#ifdef UPGRADE_SUPPORT 2967#ifdef UPGRADE_SUPPORT
2968 cleanup_upgraded_connection (pos); 2968 cleanup_upgraded_connection (pos);
@@ -6131,7 +6131,7 @@ close_all_connections (struct MHD_Daemon *daemon)
6131 if (! pos->thread_joined) 6131 if (! pos->thread_joined)
6132 { 6132 {
6133 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 6133 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
6134 if (! MHD_join_thread_ (pos->pid)) 6134 if (! MHD_join_thread_ (pos->pid.handle))
6135 MHD_PANIC (_("Failed to join a thread\n")); 6135 MHD_PANIC (_("Failed to join a thread\n"));
6136 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); 6136 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
6137 pos->thread_joined = true; 6137 pos->thread_joined = true;
@@ -6218,7 +6218,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
6218 /* Start harvesting. */ 6218 /* Start harvesting. */
6219 for (i = 0; i < daemon->worker_pool_size; ++i) 6219 for (i = 0; i < daemon->worker_pool_size; ++i)
6220 { 6220 {
6221 if (! MHD_join_thread_ (daemon->worker_pool[i].pid)) 6221 if (! MHD_join_thread_ (daemon->worker_pool[i].pid.handle))
6222 MHD_PANIC (_("Failed to join a thread\n")); 6222 MHD_PANIC (_("Failed to join a thread\n"));
6223#ifdef EPOLL_SUPPORT 6223#ifdef EPOLL_SUPPORT
6224 if (-1 != daemon->worker_pool[i].epoll_fd) 6224 if (-1 != daemon->worker_pool[i].epoll_fd)
@@ -6252,7 +6252,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
6252 SHUT_RDWR); 6252 SHUT_RDWR);
6253 } 6253 }
6254#endif 6254#endif
6255 if (! MHD_join_thread_ (daemon->pid)) 6255 if (! MHD_join_thread_ (daemon->pid.handle))
6256 { 6256 {
6257 MHD_PANIC (_("Failed to join a thread\n")); 6257 MHD_PANIC (_("Failed to join a thread\n"));
6258 } 6258 }