aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 021f1d6f..cae031bd 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3275,7 +3275,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
3275 DLL_insert (daemon->cleanup_head, 3275 DLL_insert (daemon->cleanup_head,
3276 daemon->cleanup_tail, 3276 daemon->cleanup_tail,
3277 pos); 3277 pos);
3278 3278 daemon->data_already_pending = true;
3279 } 3279 }
3280#endif /* UPGRADE_SUPPORT */ 3280#endif /* UPGRADE_SUPPORT */
3281 pos->resuming = false; 3281 pos->resuming = false;
@@ -3770,14 +3770,12 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
3770#endif 3770#endif
3771 return MHD_NO; 3771 return MHD_NO;
3772 } 3772 }
3773
3774 if (daemon->data_already_pending) 3773 if (daemon->data_already_pending)
3775 { 3774 {
3776 /* Some data already waiting to be processed. */ 3775 /* Some data already waiting to be processed. */
3777 *timeout = 0; 3776 *timeout = 0;
3778 return MHD_YES; 3777 return MHD_YES;
3779 } 3778 }
3780
3781#ifdef EPOLL_SUPPORT 3779#ifdef EPOLL_SUPPORT
3782 if ( (0 != (daemon->options & MHD_USE_EPOLL)) && 3780 if ( (0 != (daemon->options & MHD_USE_EPOLL)) &&
3783 ((NULL != daemon->eready_head) 3781 ((NULL != daemon->eready_head)
@@ -5090,6 +5088,7 @@ close_connection (struct MHD_Connection *pos)
5090 DLL_insert (daemon->cleanup_head, 5088 DLL_insert (daemon->cleanup_head,
5091 daemon->cleanup_tail, 5089 daemon->cleanup_tail,
5092 pos); 5090 pos);
5091 daemon->data_already_pending = true;
5093#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) 5092#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
5094 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 5093 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
5095#endif 5094#endif