diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-03-15 14:56:22 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2021-03-15 14:56:22 +0300 |
commit | 4c0247d46b9cbe48b4a48c8cd045c03cc3dd41b9 (patch) | |
tree | c85f9c292778ebbeac4eacd07b4eb072d5feb93a | |
parent | 55e6a9e275107970a3d3a08725d3e2310ecd11cf (diff) | |
download | libmicrohttpd-4c0247d46b9cbe48b4a48c8cd045c03cc3dd41b9.tar.gz libmicrohttpd-4c0247d46b9cbe48b4a48c8cd045c03cc3dd41b9.zip |
MHD_start_daemon(): do not use log before user settings are processed
-rw-r--r-- | src/microhttpd/daemon.c | 20 |
1 files 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, | |||
6236 | if ( (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)) && | 6236 | if ( (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)) && |
6237 | (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) ) | 6237 | (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) ) |
6238 | { | 6238 | { |
6239 | #ifdef HAVE_MESSAGES | 6239 | /* Log warning message later, when log parameters are processes */ |
6240 | MHD_DLOG (daemon, | ||
6241 | _ ( | ||
6242 | "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with " | ||
6243 | "MHD_USE_INTERNAL_POLLING_THREAD. Flag MHD_USE_INTERNAL_POLLING_THREAD " | ||
6244 | "was added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD explicitly.\n")); | ||
6245 | #endif | ||
6246 | *pflags |= MHD_USE_INTERNAL_POLLING_THREAD; | 6240 | *pflags |= MHD_USE_INTERNAL_POLLING_THREAD; |
6247 | } | 6241 | } |
6248 | if (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) | 6242 | if (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) |
@@ -6280,6 +6274,18 @@ MHD_start_daemon_va (unsigned int flags, | |||
6280 | return NULL; | 6274 | return NULL; |
6281 | } | 6275 | } |
6282 | 6276 | ||
6277 | #ifdef HAVE_MESSAGES | ||
6278 | if ( (0 != (flags & MHD_USE_THREAD_PER_CONNECTION)) && | ||
6279 | (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD)) ) | ||
6280 | { | ||
6281 | MHD_DLOG (daemon, | ||
6282 | _ ( | ||
6283 | "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with " | ||
6284 | "MHD_USE_INTERNAL_POLLING_THREAD. Flag MHD_USE_INTERNAL_POLLING_THREAD " | ||
6285 | "was added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD explicitly.\n")); | ||
6286 | } | ||
6287 | #endif | ||
6288 | |||
6283 | if ( (NULL != daemon->notify_completed) && | 6289 | if ( (NULL != daemon->notify_completed) && |
6284 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) | 6290 | (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ) |
6285 | *pflags |= MHD_USE_ITC; /* requires ITC */ | 6291 | *pflags |= MHD_USE_ITC; /* requires ITC */ |