[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 08/13: Improved daemon shutdown handling in external pol
From: |
gnunet |
Subject: |
[libmicrohttpd] 08/13: Improved daemon shutdown handling in external polling mode |
Date: |
Thu, 23 Nov 2023 11:49:11 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit f6b5ec5869da147ab6c107cd616195f0b9c2c6c8
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Tue Nov 21 15:41:56 2023 +0300
Improved daemon shutdown handling in external polling mode
---
src/microhttpd/daemon.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 44be347a..56abbdf3 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -992,7 +992,7 @@ internal_get_fdset2 (struct MHD_Daemon *daemon,
MHD_socket ls;
if (daemon->shutdown)
- return MHD_NO;
+ return MHD_YES;
ls = daemon->listen_fd;
if ( (MHD_INVALID_SOCKET != ls) &&
@@ -1204,7 +1204,7 @@ MHD_get_fdset2 (struct MHD_Daemon *daemon,
if (MHD_D_IS_USING_EPOLL_ (daemon))
{
if (daemon->shutdown)
- return MHD_NO;
+ return MHD_YES;
/* we're in epoll mode, use the epoll FD as a stand-in for
the entire event set */
@@ -4208,7 +4208,8 @@ MHD_get_timeout64 (struct MHD_Daemon *daemon,
if (daemon->data_already_pending
|| (NULL != daemon->cleanup_head)
|| daemon->resuming
- || daemon->have_new)
+ || daemon->have_new
+ || daemon->shutdown)
{
/* Some data or connection statuses already waiting to be processed. */
*timeout64 = 0;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [libmicrohttpd] branch master updated (cd4d2f65 -> a19df909), gnunet, 2023/11/23
- [libmicrohttpd] 03/13: MHD_start_daemon(): moved daemon flags internal initialisation, gnunet, 2023/11/23
- [libmicrohttpd] 01/13: Added detection of more conditions to process the data without waiting, gnunet, 2023/11/23
- [libmicrohttpd] 04/13: MHD_start_daemon(): reject INTERNAL_POLLING_THREAD if threads are disabled, gnunet, 2023/11/23
- [libmicrohttpd] 02/13: MHD_quiesce_daemon(): fixed return value if already quiesced, gnunet, 2023/11/23
- [libmicrohttpd] 05/13: Moved user options counter to shorter its lifetime, gnunet, 2023/11/23
- [libmicrohttpd] 06/13: test_daemon: fixed to not skip if failed, gnunet, 2023/11/23
- [libmicrohttpd] 08/13: Improved daemon shutdown handling in external polling mode,
gnunet <=
- [libmicrohttpd] 07/13: test_digestauth2: fixed order of the initial checks, gnunet, 2023/11/23
- [libmicrohttpd] 09/13: Micro-optimisations for non-overridable FD_SETSIZE, gnunet, 2023/11/23
- [libmicrohttpd] 13/13: Officially support zero for MHD_OPTION_THREAD_POOL_SIZE, gnunet, 2023/11/23
- [libmicrohttpd] 10/13: Unified and simplified fd_set filling, gnunet, 2023/11/23
- [libmicrohttpd] 11/13: Added new daemon flag MHD_USE_NO_THREAD_SAFETY, gnunet, 2023/11/23
- [libmicrohttpd] 12/13: Tests: added use of MHD_USE_NO_THREAD_SAFETY flag, gnunet, 2023/11/23