diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-28 16:41:17 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-28 16:41:17 +0000 |
commit | eb34a0239f3d63fd2c04401bf341aacf38a141e3 (patch) | |
tree | 8cfd66fe0f6a84a0055f32d6132ebe9c2fbf62e6 | |
parent | 0617124c369fe150123ced3e1c521d69ed4bfff2 (diff) | |
download | libmicrohttpd-eb34a0239f3d63fd2c04401bf341aacf38a141e3.tar.gz libmicrohttpd-eb34a0239f3d63fd2c04401bf341aacf38a141e3.zip |
fix #3007
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 11 | ||||
-rw-r--r-- | src/microhttpd/internal.h | 1 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,6 @@ | |||
1 | Wed Aug 28 18:40:47 CEST 2013 | ||
2 | Fix #3007 (build issue if messages are disabled). -CG | ||
3 | |||
1 | Tue Aug 27 18:39:08 CEST 2013 | 4 | Tue Aug 27 18:39:08 CEST 2013 |
2 | Fix build issue if SOCK_NONBLOCK/EPOLL_CLOEXEC are not | 5 | Fix build issue if SOCK_NONBLOCK/EPOLL_CLOEXEC are not |
3 | defined (as is the case on older glibc versions). -CG | 6 | defined (as is the case on older glibc versions). -CG |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index a5e0f076..1a47b972 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -625,8 +625,10 @@ MHD_get_fdset (struct MHD_Daemon *daemon, | |||
625 | } | 625 | } |
626 | } | 626 | } |
627 | #if DEBUG_CONNECT | 627 | #if DEBUG_CONNECT |
628 | #if HAVE_MESSAGES | ||
628 | MHD_DLOG (daemon, "Maximum socket in select set: %d\n", *max_fd); | 629 | MHD_DLOG (daemon, "Maximum socket in select set: %d\n", *max_fd); |
629 | #endif | 630 | #endif |
631 | #endif | ||
630 | return MHD_YES; | 632 | return MHD_YES; |
631 | } | 633 | } |
632 | 634 | ||
@@ -1276,9 +1278,12 @@ internal_add_connection (struct MHD_Daemon *daemon, | |||
1276 | if ( (MHD_YES == external_add) && | 1278 | if ( (MHD_YES == external_add) && |
1277 | (-1 != daemon->wpipe[1]) && | 1279 | (-1 != daemon->wpipe[1]) && |
1278 | (1 != WRITE (daemon->wpipe[1], "n", 1)) ) | 1280 | (1 != WRITE (daemon->wpipe[1], "n", 1)) ) |
1279 | MHD_DLOG (daemon, | 1281 | { |
1280 | "failed to signal new connection via pipe"); | 1282 | #if HAVE_MESSAGES |
1281 | 1283 | MHD_DLOG (daemon, | |
1284 | "failed to signal new connection via pipe"); | ||
1285 | #endif | ||
1286 | } | ||
1282 | #if EPOLL_SUPPORT | 1287 | #if EPOLL_SUPPORT |
1283 | if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) | 1288 | if (0 != (daemon->options & MHD_USE_EPOLL_LINUX_ONLY)) |
1284 | { | 1289 | { |
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h index 7db85695..ffb1a667 100644 --- a/src/microhttpd/internal.h +++ b/src/microhttpd/internal.h | |||
@@ -185,7 +185,6 @@ struct MHD_NonceNc | |||
185 | void | 185 | void |
186 | MHD_DLOG (const struct MHD_Daemon *daemon, | 186 | MHD_DLOG (const struct MHD_Daemon *daemon, |
187 | const char *format, ...); | 187 | const char *format, ...); |
188 | |||
189 | #endif | 188 | #endif |
190 | 189 | ||
191 | /** | 190 | /** |