aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-07-28 14:41:40 +0000
committerChristian Grothoff <christian@grothoff.org>2013-07-28 14:41:40 +0000
commit7056c9e811352498bba2765a4c47893906a2bc19 (patch)
tree85c19fa50fc21b5797180daefa979da209ee544b
parentf862cd4954d45b35fd3cacb4ef8c519f10014177 (diff)
downloadlibmicrohttpd-7056c9e811352498bba2765a4c47893906a2bc19.tar.gz
libmicrohttpd-7056c9e811352498bba2765a4c47893906a2bc19.zip
-fix #2968
-rw-r--r--ChangeLog4
-rw-r--r--src/microhttpd/daemon.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7aedb0a1..c13662cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
1Sun Jul 28 16:35:17 CEST 2013
2 Fixing build issue (missing #ifdef) in conjunction with
3 --disable-messages. -blueness
4
1Sat Jul 20 12:35:40 CEST 2013 5Sat Jul 20 12:35:40 CEST 2013
2 Fixing combination of MHD_USE_SSL and MHD_USE_EPOLL_LINUX_ONLY. -CG 6 Fixing combination of MHD_USE_SSL and MHD_USE_EPOLL_LINUX_ONLY. -CG
3 7
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index d9d88ec1..52b73e8a 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3119,9 +3119,11 @@ MHD_start_daemon_va (unsigned int flags,
3119 int sk_flags = fcntl (socket_fd, F_GETFL); 3119 int sk_flags = fcntl (socket_fd, F_GETFL);
3120 if (0 != fcntl (socket_fd, F_SETFL, sk_flags | O_NONBLOCK)) 3120 if (0 != fcntl (socket_fd, F_SETFL, sk_flags | O_NONBLOCK))
3121 { 3121 {
3122#if HAVE_MESSAGES
3122 MHD_DLOG (daemon, 3123 MHD_DLOG (daemon,
3123 "Failed to make listen socket non-blocking: %s\n", 3124 "Failed to make listen socket non-blocking: %s\n",
3124 STRERROR (errno)); 3125 STRERROR (errno));
3126#endif
3125 if (0 != CLOSE (socket_fd)) 3127 if (0 != CLOSE (socket_fd))
3126 MHD_PANIC ("close failed\n"); 3128 MHD_PANIC ("close failed\n");
3127 goto free_and_fail; 3129 goto free_and_fail;