[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] branch master updated: fix thread-start issue discovered
From: |
gnunet |
Subject: |
[libmicrohttpd] branch master updated: fix thread-start issue discovered by Damon Earp |
Date: |
Sat, 26 Sep 2020 20:30:06 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new 1d9f940d fix thread-start issue discovered by Damon Earp
1d9f940d is described below
commit 1d9f940dca89a5ee95a3247e43440ebd16c903af
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Sep 26 20:23:01 2020 +0200
fix thread-start issue discovered by Damon Earp
---
ChangeLog | 4 ++++
src/include/microhttpd.h | 2 +-
src/microhttpd/daemon.c | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4049304b..9ad82c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat 26 Sep 2020 08:18:02 PM CEST
+ Make MHD_USE_NO_LISTEN_SOCKET work in conjunction with
+ MHD internal threads. -CG/DE
+
Fri 11 Sep 2020 10:08:22 PM CEST
Fix crash problem in PostProcessor reported by MD. -CG
Fix GnuTLS configure test to check for gnutls_record_uncork. -CG
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;
* Current version of the library.
* 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00097103
+#define MHD_VERSION 0x00097104
/**
* 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,
#endif /* HTTPS_SUPPORT */
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
if ( (0 != (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) &&
- (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) )
+ ( (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) ||
+ (MHD_ITC_IS_VALID_ (daemon->itc)) ) )
{
if (0 == daemon->worker_pool_size)
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libmicrohttpd] branch master updated: fix thread-start issue discovered by Damon Earp,
gnunet <=