diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-26 22:00:41 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-26 22:22:34 +0300 |
commit | 25d381f4c004feda143e614406a6329864c76073 (patch) | |
tree | 0112f3927e414326e346ecaf63875480d67fd0a8 /src | |
parent | 6f6a4e220b2a02b86364cfe093570ad4ddd06860 (diff) | |
download | libmicrohttpd-25d381f4c004feda143e614406a6329864c76073.tar.gz libmicrohttpd-25d381f4c004feda143e614406a6329864c76073.zip |
Fixed MHD_quiesce_daemon() after 7b0d92902c92782844e84e40ab54d58a65531a65
Diffstat (limited to 'src')
-rw-r--r-- | src/microhttpd/daemon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index bda9292f..b01539bb 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -4643,7 +4643,7 @@ MHD_quiesce_daemon (struct MHD_Daemon *daemon) | |||
4643 | ret = daemon->listen_fd; | 4643 | ret = daemon->listen_fd; |
4644 | if (MHD_INVALID_SOCKET == ret) | 4644 | if (MHD_INVALID_SOCKET == ret) |
4645 | return MHD_INVALID_SOCKET; | 4645 | return MHD_INVALID_SOCKET; |
4646 | if ( (MHD_ITC_IS_INVALID_(daemon->itc)) && | 4646 | if ( (0 == (daemon->options & (MHD_USE_ITC))) && |
4647 | (0 != (daemon->options & (MHD_USE_INTERNAL_POLLING_THREAD))) ) | 4647 | (0 != (daemon->options & (MHD_USE_INTERNAL_POLLING_THREAD))) ) |
4648 | { | 4648 | { |
4649 | #ifdef HAVE_MESSAGES | 4649 | #ifdef HAVE_MESSAGES |
@@ -5978,6 +5978,8 @@ MHD_start_daemon_va (unsigned int flags, | |||
5978 | goto thread_failed; | 5978 | goto thread_failed; |
5979 | } | 5979 | } |
5980 | } | 5980 | } |
5981 | else | ||
5982 | MHD_itc_set_invalid_ (d->itc); | ||
5981 | 5983 | ||
5982 | /* Divide available connections evenly amongst the threads. | 5984 | /* Divide available connections evenly amongst the threads. |
5983 | * Thread indexes in [0, leftover_conns) each get one of the | 5985 | * Thread indexes in [0, leftover_conns) each get one of the |