[GNUnet-SVN] r14928 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2011-04-08 11:49:41 +0200 (Fri, 08 Apr 2011)
New Revision: 14928

Modified:
   libmicrohttpd/AUTHORS
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/daemon.c
Log:
mantis 1674

Modified: libmicrohttpd/AUTHORS
===================================================================
--- libmicrohttpd/AUTHORS       2011-04-08 01:01:18 UTC (rev 14927)
+++ libmicrohttpd/AUTHORS       2011-04-08 09:49:41 UTC (rev 14928)
@@ -30,6 +30,7 @@
 Erik Slagter <address@hidden>
 Andreas Wehrmann <address@hidden>
 Eivind Sarto <address@hidden>
+Thomas Stalder <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-04-08 01:01:18 UTC (rev 14927)
+++ libmicrohttpd/ChangeLog     2011-04-08 09:49:41 UTC (rev 14928)
@@ -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
 

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2011-04-08 01:01:18 UTC (rev 14927)
+++ libmicrohttpd/src/daemon/daemon.c   2011-04-08 09:49:41 UTC (rev 14928)
@@ -1466,6 +1466,10 @@
     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)