aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-02-18 20:05:14 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2014-02-18 20:05:14 +0000
commita9474fdab2559ae34f861f02afc70014bbb47475 (patch)
treebbd44c90e6502523e27871768318faac14b6a112
parent97831dfd6396a3c2f670c339e402f236791fd639 (diff)
downloadlibmicrohttpd-a9474fdab2559ae34f861f02afc70014bbb47475.tar.gz
libmicrohttpd-a9474fdab2559ae34f861f02afc70014bbb47475.zip
Remove plibc leftover, update ChangeLog and docs
-rw-r--r--ChangeLog7
-rw-r--r--doc/libmicrohttpd.texi13
-rw-r--r--src/microhttpd/daemon.c8
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 @@
1Tue Feb 18 19:46:45 CET 2014
2 Removed dependency on plibc for simpler compilation for W32.
3 Added configure option "--disable-pipes" to use socketpairs
4 instead of pipes for signalling to child threads. Pipes are
5 always disabled on W32.
6 Some code refactoring. - EG
7
1Sat Feb 8 15:08:35 CET 2014 8Sat Feb 8 15:08:35 CET 2014
2 Corrected some uses of 'int' vs. 'size_t'. -EG/CG 9 Corrected some uses of 'int' vs. 'size_t'. -EG/CG
3 10
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.
359 359
360@section Portability to W32 360@section Portability to W32
361 361
362On W32, GNUnet requires PlibC, a lightweight library to provide some 362libmicrohttpd in general ported well to W32. Most libmicrohttpd features
363more POSIX-like calls on W32. While PlibC takes care of most issues, 363are supported. W32 do not support some functions, like epoll and
364it is unable to make @code{select} (or equivalent alternative socket 364corresponding MHD features are not available on W32.
365calls) unblock when a socket is @code{shutdown}. This can be
366problematic if MHD is used in ``one thread per connection'' mode. In
367this case, an inactive TCP connection may block @code{MHD_stop_daemon}
368until the connection times out. You may be able to mitigate the issue
369by setting a reasonably low timeout, but in general we of course
370recommend migrating away from Windows. Using MHD with other types of
371event loops is unaffected by this issue.
372 365
373 366
374@section Portability to z/OS 367@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,
3681 goto thread_failed; 3681 goto thread_failed;
3682#else 3682#else
3683 sk_flags = 1; 3683 sk_flags = 1;
3684#if HAVE_PLIBC_FD 3684 if (SOCKET_ERROR == ioctlsocket (socket_fd, FIONBIO, &sk_flags))
3685 if (SOCKET_ERROR ==
3686 ioctlsocket (plibc_fd_get_handle (socket_fd), FIONBIO, &sk_flags))
3687 goto thread_failed; 3685 goto thread_failed;
3688#else
3689 if (ioctlsocket (socket_fd, FIONBIO, &sk_flags) == SOCKET_ERROR)
3690 goto thread_failed;
3691#endif // PLIBC_FD
3692#endif // MINGW 3686#endif // MINGW
3693 3687
3694 /* Allocate memory for pooled objects */ 3688 /* Allocate memory for pooled objects */