[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 03/07: Simplification: move external loop s
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 03/07: Simplification: move external loop specific code from internal_run_from_select() to MHD_run_from_select(). |
Date: |
Sun, 26 Mar 2017 12:52:41 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit b5bfa6ee2c0bfdc478ad2bf55f6b3bf997dabcd2
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Mar 26 12:40:43 2017 +0300
Simplification: move external loop specific code from
internal_run_from_select() to
MHD_run_from_select().
---
src/microhttpd/daemon.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 161ce5e0..89771188 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3332,8 +3332,6 @@ internal_run_from_select (struct MHD_Daemon *daemon,
struct MHD_UpgradeResponseHandle *urh;
struct MHD_UpgradeResponseHandle *urhn;
#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
- unsigned int mask = MHD_TEST_ALLOW_SUSPEND_RESUME |
MHD_USE_INTERNAL_POLLING_THREAD;
-
/* Reset. New value will be set when connections are processed. */
/* Note: no-op for thread-per-connection as it is always false in that mode.
*/
daemon->data_already_pending = false;
@@ -3346,10 +3344,6 @@ internal_run_from_select (struct MHD_Daemon *daemon,
read_fd_set)) )
MHD_itc_clear_ (daemon->itc);
- /* Resuming external connections when using an extern mainloop */
- if (MHD_TEST_ALLOW_SUSPEND_RESUME == (daemon->options & mask))
- resume_suspended_connections (daemon);
-
#ifdef EPOLL_SUPPORT
if (0 != (daemon->options & MHD_USE_EPOLL))
{
@@ -3477,6 +3471,10 @@ MHD_run_from_select (struct MHD_Daemon *daemon,
return MHD_NO;
#endif /* ! EPOLL_SUPPORT */
}
+
+ /* Resuming external connections when using an extern mainloop */
+ resume_suspended_connections (daemon);
+
return internal_run_from_select (daemon, read_fd_set,
write_fd_set, except_fd_set);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [libmicrohttpd] branch master updated (11fc9224 -> 6f6a4e22), gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 05/07: MHD_select(): Removed bogus extra check, gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 02/07: Simplified checks for allowed suspend, fixed false positive for daemons with MHD_USE_ITC, gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 04/07: Streamlined internal usage of MHD_USE_ITC flag., gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 03/07: Simplification: move external loop specific code from internal_run_from_select() to MHD_run_from_select().,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 07/07: MHD_start_daemon(): obey MHD_USE_ITC in thread pool mode, gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 06/07: MHD_start_daemon(): removed initialisation of ITC for master daemon in thread pool mode as global ITC is not monitored. Fixed gnutls priorities deinitialization if ITC failed, gnunet, 2017/03/26
- [GNUnet-SVN] [libmicrohttpd] 01/07: MHD_start_daemon_va(): unify 'flags' and 'daemon->options' usage, gnunet, 2017/03/26