commit 3fc686e335437ec5f6d6270c8d713e9a01da966f
parent 777d5e048d02a46c535f6e53fa31cda5c5d09038
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 1 Nov 2018 16:31:03 +0100
initialize epoll_fd even if we have no listen fd, patch by Jose Bollo
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -60,6 +60,7 @@ Silvio Clecio <silvioprog@gmail.com>
Robert D Kosisko <rkocisko@gmail.com>
Tal Moaz <tmoaz@cisco.com>
Dirk Brinkmeier
+Jose Bollo <jobol@nonadev.net>
Documentation contributions also came from:
Marco Maggi <marco.maggi-ipsu@poste.it>
diff --git 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
@@ -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))
{