libmicrohttpd

commit 85150883706e631da5d0de35a5a1f452efbe1b7e
parent 73011c102052831eaa8f9e98a75abc5350155b8a
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  8 Apr 2011 09:49:41 +0000

mantis 1674

Diffstat:
M
AUTHORS
 | 
1
+
M
ChangeLog
 | 
3
+++
M
src/daemon/daemon.c
 | 
4
++++

3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -30,6 +30,7 @@ Gerrit Telkamp <g.telkamp@domologic.de>
 Erik Slagter <erik@slagter.name>
 Andreas Wehrmann <a.wehrmann@centersystems.com>
 Eivind Sarto <ivan@espial.com>
+Thomas Stalder <gnunet@netsolux.ch>
 
 Documentation contributions also came from:
 Marco Maggi <marco.maggi-ipsu@poste.it>
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Apr  8 11:40:35 CEST 2011
+	Workaround for cygwin poll brokenness. -TS
+
 Sun Apr  3 13:56:52 CEST 2011
 	Fixing compile error on OS X. -CG
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
@@ -1466,6 +1466,10 @@ MHD_poll_listen_socket (struct MHD_Daemon *daemon,
     timeout = -1;
   else
     timeout = (ltimeout > INT_MAX) ? INT_MAX : (int) ltimeout;
+#ifdef __CYGWIN__
+  /* See https://gnunet.org/bugs/view.php?id=1674 */
+  timeout = (timeout > 2000) ? 2000 : timeout;
+#endif
   if (poll (&p, 1, timeout) < 0)
     {
       if (errno == EINTR)