aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/microhttpd/daemon.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 1d44f344..900bfd72 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -1520,6 +1520,8 @@ enum MHD_OPTION
1520 * a function of type #MHD_LogCallback and the second a pointer 1520 * a function of type #MHD_LogCallback and the second a pointer
1521 * `void *` which will be passed as the first argument to the log 1521 * `void *` which will be passed as the first argument to the log
1522 * callback. 1522 * callback.
1523 * Should be specified as the first option, otherwise some messages
1524 * may be printed by standard MHD logger during daemon startup.
1523 * 1525 *
1524 * Note that MHD will not generate any log messages 1526 * Note that MHD will not generate any log messages
1525 * if it was compiled without the "--enable-messages" 1527 * if it was compiled without the "--enable-messages"
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 8f548945..535d85aa 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5741,6 +5741,12 @@ parse_options_va (struct MHD_Daemon *daemon,
5741 VfprintfFunctionPointerType); 5741 VfprintfFunctionPointerType);
5742 daemon->custom_error_log_cls = va_arg (ap, 5742 daemon->custom_error_log_cls = va_arg (ap,
5743 void *); 5743 void *);
5744 if (1 != daemon->num_opts)
5745 MHD_DLOG (daemon,
5746 _ ("MHD_OPTION_EXTERNAL_LOGGER is not the first option "
5747 "specified for the daemon. Some messages may be "
5748 "printed by the standard MHD logger.\n"));
5749
5744#else 5750#else
5745 va_arg (ap, 5751 va_arg (ap,
5746 VfprintfFunctionPointerType); 5752 VfprintfFunctionPointerType);