diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 10 |
1 files 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, | |||
3332 | struct MHD_UpgradeResponseHandle *urh; | 3332 | struct MHD_UpgradeResponseHandle *urh; |
3333 | struct MHD_UpgradeResponseHandle *urhn; | 3333 | struct MHD_UpgradeResponseHandle *urhn; |
3334 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ | 3334 | #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */ |
3335 | unsigned int mask = MHD_TEST_ALLOW_SUSPEND_RESUME | MHD_USE_INTERNAL_POLLING_THREAD; | ||
3336 | |||
3337 | /* Reset. New value will be set when connections are processed. */ | 3335 | /* Reset. New value will be set when connections are processed. */ |
3338 | /* Note: no-op for thread-per-connection as it is always false in that mode. */ | 3336 | /* Note: no-op for thread-per-connection as it is always false in that mode. */ |
3339 | daemon->data_already_pending = false; | 3337 | daemon->data_already_pending = false; |
@@ -3346,10 +3344,6 @@ internal_run_from_select (struct MHD_Daemon *daemon, | |||
3346 | read_fd_set)) ) | 3344 | read_fd_set)) ) |
3347 | MHD_itc_clear_ (daemon->itc); | 3345 | MHD_itc_clear_ (daemon->itc); |
3348 | 3346 | ||
3349 | /* Resuming external connections when using an extern mainloop */ | ||
3350 | if (MHD_TEST_ALLOW_SUSPEND_RESUME == (daemon->options & mask)) | ||
3351 | resume_suspended_connections (daemon); | ||
3352 | |||
3353 | #ifdef EPOLL_SUPPORT | 3347 | #ifdef EPOLL_SUPPORT |
3354 | if (0 != (daemon->options & MHD_USE_EPOLL)) | 3348 | if (0 != (daemon->options & MHD_USE_EPOLL)) |
3355 | { | 3349 | { |
@@ -3477,6 +3471,10 @@ MHD_run_from_select (struct MHD_Daemon *daemon, | |||
3477 | return MHD_NO; | 3471 | return MHD_NO; |
3478 | #endif /* ! EPOLL_SUPPORT */ | 3472 | #endif /* ! EPOLL_SUPPORT */ |
3479 | } | 3473 | } |
3474 | |||
3475 | /* Resuming external connections when using an extern mainloop */ | ||
3476 | resume_suspended_connections (daemon); | ||
3477 | |||
3480 | return internal_run_from_select (daemon, read_fd_set, | 3478 | return internal_run_from_select (daemon, read_fd_set, |
3481 | write_fd_set, except_fd_set); | 3479 | write_fd_set, except_fd_set); |
3482 | } | 3480 | } |