From b5bfa6ee2c0bfdc478ad2bf55f6b3bf997dabcd2 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Sun, 26 Mar 2017 12:40:43 +0300 Subject: [PATCH] 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); }