aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-09-26 20:23:01 +0200
committerChristian Grothoff <christian@grothoff.org>2020-09-26 20:23:21 +0200
commit1d9f940dca89a5ee95a3247e43440ebd16c903af (patch)
treef2cb3c6c633c5b901d84f152aef55e5a9b0ade96 /src
parentefd1dd05f42d5934494dbda4f63328b8f1080427 (diff)
downloadlibmicrohttpd-1d9f940dca89a5ee95a3247e43440ebd16c903af.tar.gz
libmicrohttpd-1d9f940dca89a5ee95a3247e43440ebd16c903af.zip
fix thread-start issue discovered by Damon Earp
Diffstat (limited to 'src')
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/microhttpd/daemon.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index ad056c9b..b57ced32 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -132,7 +132,7 @@ typedef intptr_t ssize_t;
132 * Current version of the library. 132 * Current version of the library.
133 * 0x01093001 = 1.9.30-1. 133 * 0x01093001 = 1.9.30-1.
134 */ 134 */
135#define MHD_VERSION 0x00097103 135#define MHD_VERSION 0x00097104
136 136
137/** 137/**
138 * Operational results from MHD calls. 138 * Operational results from MHD calls.
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a9151fc5..a21462db 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6427,7 +6427,8 @@ MHD_start_daemon_va (unsigned int flags,
6427#endif /* HTTPS_SUPPORT */ 6427#endif /* HTTPS_SUPPORT */
6428#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) 6428#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
6429 if ( (0 != (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) && 6429 if ( (0 != (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) &&
6430 (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) ) 6430 ( (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) ||
6431 (MHD_ITC_IS_VALID_ (daemon->itc)) ) )
6431 { 6432 {
6432 if (0 == daemon->worker_pool_size) 6433 if (0 == daemon->worker_pool_size)
6433 { 6434 {