3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e971b857..b96bbf8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 28c3792b..fc131f3f 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -130,7 +130,7 @@ typedef intptr_t ssize_t;
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093904
+#define MHD_VERSION 0x00093905
 
 /**
  * MHD-internal return code for "YES".
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index dd2234fd..49bdc962 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3551,7 +3551,7 @@ MHD_start_daemon_va (unsigned int flags,
       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 @@ MHD_start_daemon_va (unsigned int flags,
               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) )
             {