[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 01/03: MHD_start_daemon(): do not use log before user se
From: |
gnunet |
Subject: |
[libmicrohttpd] 01/03: MHD_start_daemon(): do not use log before user settings are processed |
Date: |
Mon, 15 Mar 2021 14:37:58 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 4c0247d46b9cbe48b4a48c8cd045c03cc3dd41b9
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Mon Mar 15 14:56:22 2021 +0300
MHD_start_daemon(): do not use log before user settings are processed
---
src/microhttpd/daemon.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index bcf1a014..916544fa 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -6236,13 +6236,7 @@ MHD_start_daemon_va (unsigned int flags,
if ( (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)) &&
(0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) )
{
-#ifdef HAVE_MESSAGES
- MHD_DLOG (daemon,
- _ (
- "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with
"
- "MHD_USE_INTERNAL_POLLING_THREAD. Flag
MHD_USE_INTERNAL_POLLING_THREAD "
- "was added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD
explicitly.\n"));
-#endif
+ /* Log warning message later, when log parameters are processes */
*pflags |= MHD_USE_INTERNAL_POLLING_THREAD;
}
if (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD))
@@ -6280,6 +6274,18 @@ MHD_start_daemon_va (unsigned int flags,
return NULL;
}
+#ifdef HAVE_MESSAGES
+ if ( (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) &&
+ (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD)) )
+ {
+ MHD_DLOG (daemon,
+ _ (
+ "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with
"
+ "MHD_USE_INTERNAL_POLLING_THREAD. Flag
MHD_USE_INTERNAL_POLLING_THREAD "
+ "was added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD
explicitly.\n"));
+ }
+#endif
+
if ( (NULL != daemon->notify_completed) &&
(0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
*pflags |= MHD_USE_ITC; /* requires ITC */
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.