diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-11-01 16:31:03 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-11-01 16:31:03 +0100 |
commit | 3fc686e335437ec5f6d6270c8d713e9a01da966f (patch) | |
tree | b9bdb1fb970a6187e17c9723062213cdc789c02a | |
parent | 777d5e048d02a46c535f6e53fa31cda5c5d09038 (diff) | |
download | libmicrohttpd-3fc686e335437ec5f6d6270c8d713e9a01da966f.tar.gz libmicrohttpd-3fc686e335437ec5f6d6270c8d713e9a01da966f.zip |
initialize epoll_fd even if we have no listen fd, patch by Jose Bollo
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 5 |
3 files changed, 6 insertions, 3 deletions
@@ -60,6 +60,7 @@ Silvio Clecio <silvioprog@gmail.com> | |||
60 | Robert D Kosisko <rkocisko@gmail.com> | 60 | Robert D Kosisko <rkocisko@gmail.com> |
61 | Tal Moaz <tmoaz@cisco.com> | 61 | Tal Moaz <tmoaz@cisco.com> |
62 | Dirk Brinkmeier | 62 | Dirk Brinkmeier |
63 | Jose Bollo <jobol@nonadev.net> | ||
63 | 64 | ||
64 | Documentation contributions also came from: | 65 | Documentation contributions also came from: |
65 | Marco Maggi <marco.maggi-ipsu@poste.it> | 66 | Marco Maggi <marco.maggi-ipsu@poste.it> |
@@ -1,3 +1,6 @@ | |||
1 | Thu Nov 1 16:29:59 CET 2018 | ||
2 | Enable using epoll() without listen socket. -JB | ||
3 | |||
1 | Sat Oct 20 12:44:16 CEST 2018 | 4 | Sat Oct 20 12:44:16 CEST 2018 |
2 | In thread-per-connection mode, signal main thread for | 5 | In thread-per-connection mode, signal main thread for |
3 | thread termination for instant clean-up and application | 6 | 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 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libmicrohttpd | 2 | This file is part of libmicrohttpd |
3 | Copyright (C) 2007-2017 Daniel Pittman and Christian Grothoff | 3 | Copyright (C) 2007-2018 Daniel Pittman and Christian Grothoff |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Lesser General Public | 6 | modify it under the terms of the GNU Lesser General Public |
@@ -5990,8 +5990,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
5990 | 5990 | ||
5991 | #ifdef EPOLL_SUPPORT | 5991 | #ifdef EPOLL_SUPPORT |
5992 | if ( (0 != (*pflags & MHD_USE_EPOLL)) && | 5992 | if ( (0 != (*pflags & MHD_USE_EPOLL)) && |
5993 | (0 == daemon->worker_pool_size) && | 5993 | (0 == daemon->worker_pool_size) ) |
5994 | (0 == (*pflags & MHD_USE_NO_LISTEN_SOCKET)) ) | ||
5995 | { | 5994 | { |
5996 | if (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)) | 5995 | if (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION)) |
5997 | { | 5996 | { |