[GNUnet-SVN] [libmicrohttpd] branch master updated: initialize epoll_fd even if we have no listen fd, patch by Jose Bollo

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new 3fc686e3 initialize epoll_fd even if we have no listen fd, patch by 
Jose Bollo
3fc686e3 is described below

commit 3fc686e335437ec5f6d6270c8d713e9a01da966f
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Nov 1 16:31:03 2018 +0100

    initialize epoll_fd even if we have no listen fd, patch by Jose Bollo
---
 AUTHORS                 | 1 +
 ChangeLog               | 3 +++
 src/microhttpd/daemon.c | 5 ++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 71855aa0..57cb9217 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -60,6 +60,7 @@ Silvio Clecio <address@hidden>
 Robert D Kosisko <address@hidden>
 Tal Moaz <address@hidden>
 Dirk Brinkmeier
+Jose Bollo <address@hidden>
 
 Documentation contributions also came from:
 Marco Maggi <address@hidden>
diff --git a/ChangeLog b/ChangeLog
index e623d4c0..eb71f6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Nov  1 16:29:59 CET 2018
+       Enable using epoll() without listen socket. -JB
+
 Sat Oct 20 12:44:16 CEST 2018
        In thread-per-connection mode, signal main thread for
        thread termination for instant clean-up and application
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index cd2ca189..2b7bb66d 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1,6 +1,6 @@
 /*
   This file is part of libmicrohttpd
-  Copyright (C) 2007-2017 Daniel Pittman and Christian Grothoff
+  Copyright (C) 2007-2018 Daniel Pittman and Christian Grothoff
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -5990,8 +5990,7 @@ MHD_start_daemon_va (unsigned int flags,
 
 #ifdef EPOLL_SUPPORT
   if ( (0 != (*pflags & MHD_USE_EPOLL)) &&
-       (0 == daemon->worker_pool_size) &&
-       (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) )
+       (0 == daemon->worker_pool_size) )
     {
       if (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION))
        {

-- 
To stop receiving notification emails like this one, please contact
address@hidden