[GNUnet-SVN] r35492 - in libmicrohttpd: . src/include src/microhttpd

[gnunet]

Author: grothoff
Date: 2015-04-03 12:29:12 +0200 (Fri, 03 Apr 2015)
New Revision: 35492

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/daemon.c
Log:
fix #3751

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2015-04-01 14:05:10 UTC (rev 35491)
+++ libmicrohttpd/ChangeLog     2015-04-03 10:29:12 UTC (rev 35492)
@@ -1,3 +1,7 @@
+Fri Apr  3 12:25:28 CEST 2015
+       Do not enforce FD_SETSIZE-limit on worker control
+       pipe when using MHD_USE_EPOLL_LINUX_ONLY (#3751). -MH/CG
+
 Tue Mar 31 10:28:26 CEST 2015
        Adding MHD_OPTION_NOTIFY_CONNECTION,
        MHD_CONNECTION_NOTIFY_STARTED,

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2015-04-01 14:05:10 UTC (rev 
35491)
+++ libmicrohttpd/src/include/microhttpd.h      2015-04-03 10:29:12 UTC (rev 
35492)
@@ -130,7 +130,7 @@
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093904
+#define MHD_VERSION 0x00093905
 
 /**
  * MHD-internal return code for "YES".

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-04-01 14:05:10 UTC (rev 
35491)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-04-03 10:29:12 UTC (rev 
35492)
@@ -3551,7 +3551,7 @@
       return NULL;
     }
 #ifndef WINDOWS
-  if ( (0 == (flags & MHD_USE_POLL)) &&
+  if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) &&
        (1 == use_pipe) &&
        (daemon->wpipe[0] >= FD_SETSIZE) )
     {
@@ -4083,7 +4083,7 @@
               goto thread_failed;
             }
 #ifndef WINDOWS
-          if ( (0 == (flags & MHD_USE_POLL)) &&
+          if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) &&
                (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) &&
                (d->wpipe[0] >= FD_SETSIZE) )
             {