From a9474fdab2559ae34f861f02afc70014bbb47475 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Tue, 18 Feb 2014 20:05:14 +0000 Subject: Remove plibc leftover, update ChangeLog and docs --- ChangeLog | 7 +++++++ doc/libmicrohttpd.texi | 13 +++---------- src/microhttpd/daemon.c | 8 +------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 838536d7..1ee14e29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 18 19:46:45 CET 2014 + Removed dependency on plibc for simpler compilation for W32. + Added configure option "--disable-pipes" to use socketpairs + instead of pipes for signalling to child threads. Pipes are + always disabled on W32. + Some code refactoring. - EG + Sat Feb 8 15:08:35 CET 2014 Corrected some uses of 'int' vs. 'size_t'. -EG/CG diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi index c27d36a4..68485546 100644 --- a/doc/libmicrohttpd.texi +++ b/doc/libmicrohttpd.texi @@ -359,16 +359,9 @@ for the specific platform. @section Portability to W32 -On W32, GNUnet requires PlibC, a lightweight library to provide some -more POSIX-like calls on W32. While PlibC takes care of most issues, -it is unable to make @code{select} (or equivalent alternative socket -calls) unblock when a socket is @code{shutdown}. This can be -problematic if MHD is used in ``one thread per connection'' mode. In -this case, an inactive TCP connection may block @code{MHD_stop_daemon} -until the connection times out. You may be able to mitigate the issue -by setting a reasonably low timeout, but in general we of course -recommend migrating away from Windows. Using MHD with other types of -event loops is unaffected by this issue. +libmicrohttpd in general ported well to W32. Most libmicrohttpd features +are supported. W32 do not support some functions, like epoll and +corresponding MHD features are not available on W32. @section Portability to z/OS diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 29007004..6925c923 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c @@ -3681,14 +3681,8 @@ MHD_start_daemon_va (unsigned int flags, goto thread_failed; #else sk_flags = 1; -#if HAVE_PLIBC_FD - if (SOCKET_ERROR == - ioctlsocket (plibc_fd_get_handle (socket_fd), FIONBIO, &sk_flags)) + if (SOCKET_ERROR == ioctlsocket (socket_fd, FIONBIO, &sk_flags)) goto thread_failed; -#else - if (ioctlsocket (socket_fd, FIONBIO, &sk_flags) == SOCKET_ERROR) - goto thread_failed; -#endif // PLIBC_FD #endif // MINGW /* Allocate memory for pooled objects */ -- cgit v1.2.3