diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 14 |
2 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | Tue Mar 25 20:59:18 MSK 2017 | ||
2 | Check for invalid combinations of flags and options in | ||
3 | MHD_start_daemon(). -EG | ||
4 | |||
1 | Tue Mar 21 13:51:04 CET 2017 | 5 | Tue Mar 21 13:51:04 CET 2017 |
2 | Use "-lrt" to link libmicrohttpd if we are using | 6 | Use "-lrt" to link libmicrohttpd if we are using |
3 | clock_gettime() as needed by glibc < 2.17. -CG | 7 | clock_gettime() as needed by glibc < 2.17. -CG |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 296c0ee8..69180865 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -5005,8 +5005,18 @@ parse_options_va (struct MHD_Daemon *daemon, | |||
5005 | break; | 5005 | break; |
5006 | #endif | 5006 | #endif |
5007 | case MHD_OPTION_LISTEN_SOCKET: | 5007 | case MHD_OPTION_LISTEN_SOCKET: |
5008 | daemon->listen_fd = va_arg (ap, | 5008 | if (0 != (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) |
5009 | MHD_socket); | 5009 | { |
5010 | #ifdef HAVE_MESSAGES | ||
5011 | MHD_DLOG (daemon, | ||
5012 | _("MHD_OPTION_LISTEN_SOCKET specified for daemon " | ||
5013 | "with MHD_USE_NO_LISTEN_SOCKET flag set.\n")); | ||
5014 | #endif | ||
5015 | return MHD_NO; | ||
5016 | } | ||
5017 | else | ||
5018 | daemon->listen_fd = va_arg (ap, | ||
5019 | MHD_socket); | ||
5010 | break; | 5020 | break; |
5011 | case MHD_OPTION_EXTERNAL_LOGGER: | 5021 | case MHD_OPTION_EXTERNAL_LOGGER: |
5012 | #ifdef HAVE_MESSAGES | 5022 | #ifdef HAVE_MESSAGES |