aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-05-14 14:16:29 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-05-14 14:16:29 +0300
commita66ec8da4269cbaf27b902716b63d16de51459e7 (patch)
tree5b1d2c3ad001f87d2ce8ffdfaf5a86689216a5dc /src/microhttpd/daemon.c
parent858483b5bea9ca30f3384129f956664bc0282e61 (diff)
downloadlibmicrohttpd-a66ec8da4269cbaf27b902716b63d16de51459e7.tar.gz
libmicrohttpd-a66ec8da4269cbaf27b902716b63d16de51459e7.zip
internal_run_from_select(): remove extra call for epoll run as epoll called directly
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index de36296f..74686269 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3353,21 +3353,6 @@ internal_run_from_select (struct MHD_Daemon *daemon,
3353 read_fd_set)) ) 3353 read_fd_set)) )
3354 MHD_itc_clear_ (daemon->itc); 3354 MHD_itc_clear_ (daemon->itc);
3355 3355
3356#ifdef EPOLL_SUPPORT
3357 if (0 != (daemon->options & MHD_USE_EPOLL))
3358 {
3359 /* we're in epoll mode, the epoll FD stands for
3360 the entire event set! */
3361 if (! MHD_SCKT_FD_FITS_FDSET_(daemon->epoll_fd,
3362 NULL))
3363 return MHD_NO; /* poll fd too big, fail hard */
3364 if (FD_ISSET (daemon->epoll_fd,
3365 read_fd_set))
3366 return MHD_run (daemon);
3367 return MHD_YES;
3368 }
3369#endif
3370
3371 /* select connection thread handling type */ 3356 /* select connection thread handling type */
3372 if ( (MHD_INVALID_SOCKET != (ds = daemon->listen_fd)) && 3357 if ( (MHD_INVALID_SOCKET != (ds = daemon->listen_fd)) &&
3373 (! daemon->was_quiesced) && 3358 (! daemon->was_quiesced) &&