diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index fda7f51b..5ac7c341 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -2788,7 +2788,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon) | |||
2788 | MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); | 2788 | MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); |
2789 | 2789 | ||
2790 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && | 2790 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && |
2791 | (MHD_NO == pos->thread_joined) && | 2791 | (! pos->thread_joined) && |
2792 | (! MHD_join_thread_ (pos->pid)) ) | 2792 | (! MHD_join_thread_ (pos->pid)) ) |
2793 | MHD_PANIC (_("Failed to join a thread\n")); | 2793 | MHD_PANIC (_("Failed to join a thread\n")); |
2794 | #ifdef UPGRADE_SUPPORT | 2794 | #ifdef UPGRADE_SUPPORT |
@@ -5658,11 +5658,11 @@ close_all_connections (struct MHD_Daemon *daemon) | |||
5658 | pos = daemon->connections_head; | 5658 | pos = daemon->connections_head; |
5659 | while (NULL != pos) | 5659 | while (NULL != pos) |
5660 | { | 5660 | { |
5661 | if (MHD_YES != pos->thread_joined) | 5661 | if (! pos->thread_joined) |
5662 | { | 5662 | { |
5663 | if (! MHD_join_thread_ (pos->pid)) | 5663 | if (! MHD_join_thread_ (pos->pid)) |
5664 | MHD_PANIC (_("Failed to join a thread\n")); | 5664 | MHD_PANIC (_("Failed to join a thread\n")); |
5665 | pos->thread_joined = MHD_YES; | 5665 | pos->thread_joined = true; |
5666 | /* The thread may have concurrently modified the DLL, | 5666 | /* The thread may have concurrently modified the DLL, |
5667 | need to restart from the beginning */ | 5667 | need to restart from the beginning */ |
5668 | pos = daemon->connections_head; | 5668 | pos = daemon->connections_head; |
@@ -5688,7 +5688,7 @@ close_all_connections (struct MHD_Daemon *daemon) | |||
5688 | while (NULL != (pos = daemon->connections_head)) | 5688 | while (NULL != (pos = daemon->connections_head)) |
5689 | { | 5689 | { |
5690 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && | 5690 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && |
5691 | (MHD_YES != pos->thread_joined) ) | 5691 | (! pos->thread_joined) ) |
5692 | MHD_PANIC (_("Failed to join a thread\n")); | 5692 | MHD_PANIC (_("Failed to join a thread\n")); |
5693 | close_connection (pos); | 5693 | close_connection (pos); |
5694 | } | 5694 | } |