aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-23 16:15:55 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-04-23 16:15:55 +0000
commitb3903cffea8d3b4fda1a41ce9fa36f23bdfa68fa (patch)
tree1b6daf514800cfb2a69ffaba4523280e727d7949
parent366a260595db768fa12371b8a746894e73f5af79 (diff)
downloadlibmicrohttpd-b3903cffea8d3b4fda1a41ce9fa36f23bdfa68fa.tar.gz
libmicrohttpd-b3903cffea8d3b4fda1a41ce9fa36f23bdfa68fa.zip
Revert "shutdown trigger select" on Darwin.
Fixed daemon shutdown on Darwin without "MHD_USE_PIPE_FOR_SHUTDOWN" option.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b154ffea..de75f25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
1Sat Apr 23 14:17:15 CET 2016
2 Revert "shutdown trigger select" on Darwin. Fixed daemon shutdown
3 on Darwin without "MHD_USE_PIPE_FOR_SHUTDOWN" option. -EG
4
1Fri Apr 22 14:29:28 CET 2016 5Fri Apr 22 14:29:28 CET 2016
2 Fixed race conditions when stopping quiesced daemon with thread 6 Fixed race conditions when stopping quiesced daemon with thread
3 pool. -EG 7 pool. -EG
diff --git a/configure.ac b/configure.ac
index dea7e5c0..61da658d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,6 @@ case "$host_os" in
148 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system]) 148 AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
149 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS" 149 CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
150 mhd_host_os='Darwin' 150 mhd_host_os='Darwin'
151 shutdown_trig_select='yes'
152 AC_MSG_RESULT([[$mhd_host_os]]) 151 AC_MSG_RESULT([[$mhd_host_os]])
153 ;; 152 ;;
154freebsd*) 153freebsd*)