aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/connection.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/connection.c')
-rw-r--r--src/microhttpd/connection.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index b09dbd9a..3f11b4eb 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1305,11 +1305,11 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
1305 daemon->urh_tail, 1305 daemon->urh_tail,
1306 urh); 1306 urh);
1307#ifdef EPOLL_SUPPORT 1307#ifdef EPOLL_SUPPORT
1308 if ( (0 != (daemon->options & MHD_USE_EPOLL)) && 1308 if (MHD_D_IS_USING_EPOLL_ (daemon) &&
1309 (0 != epoll_ctl (daemon->epoll_upgrade_fd, 1309 (0 != epoll_ctl (daemon->epoll_upgrade_fd,
1310 EPOLL_CTL_DEL, 1310 EPOLL_CTL_DEL,
1311 connection->socket_fd, 1311 connection->socket_fd,
1312 NULL)) ) 1312 NULL)) )
1313 { 1313 {
1314 MHD_PANIC (_ ("Failed to remove FD from epoll set.\n")); 1314 MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
1315 } 1315 }
@@ -1324,11 +1324,11 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
1324 if (MHD_INVALID_SOCKET != urh->mhd.socket) 1324 if (MHD_INVALID_SOCKET != urh->mhd.socket)
1325 { 1325 {
1326#ifdef EPOLL_SUPPORT 1326#ifdef EPOLL_SUPPORT
1327 if ( (0 != (daemon->options & MHD_USE_EPOLL)) && 1327 if (MHD_D_IS_USING_EPOLL_ (daemon) &&
1328 (0 != epoll_ctl (daemon->epoll_upgrade_fd, 1328 (0 != epoll_ctl (daemon->epoll_upgrade_fd,
1329 EPOLL_CTL_DEL, 1329 EPOLL_CTL_DEL,
1330 urh->mhd.socket, 1330 urh->mhd.socket,
1331 NULL)) ) 1331 NULL)) )
1332 { 1332 {
1333 MHD_PANIC (_ ("Failed to remove FD from epoll set.\n")); 1333 MHD_PANIC (_ ("Failed to remove FD from epoll set.\n"));
1334 } 1334 }
@@ -7509,7 +7509,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
7509 ret = MHD_YES; 7509 ret = MHD_YES;
7510#ifdef EPOLL_SUPPORT 7510#ifdef EPOLL_SUPPORT
7511 if ( (! connection->suspended) && 7511 if ( (! connection->suspended) &&
7512 (0 != (daemon->options & MHD_USE_EPOLL)) ) 7512 MHD_D_IS_USING_EPOLL_ (daemon) )
7513 { 7513 {
7514 ret = MHD_connection_epoll_update_ (connection); 7514 ret = MHD_connection_epoll_update_ (connection);
7515 } 7515 }
@@ -7533,7 +7533,7 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection)
7533{ 7533{
7534 struct MHD_Daemon *const daemon = connection->daemon; 7534 struct MHD_Daemon *const daemon = connection->daemon;
7535 7535
7536 mhd_assert (0 != (daemon->options & MHD_USE_EPOLL)); 7536 mhd_assert (MHD_D_IS_USING_EPOLL_ (daemon));
7537 7537
7538 if ((0 != (MHD_EVENT_LOOP_INFO_PROCESS & connection->event_loop_info)) && 7538 if ((0 != (MHD_EVENT_LOOP_INFO_PROCESS & connection->event_loop_info)) &&
7539 (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL))) 7539 (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EREADY_EDLL)))