commit d93a774bd642a7d83f775099959f10d246a3f1ca parent 192f1e9fab410e9fea914d2a4eefcfadd2180e78 Author: Evgeny Grin (Karlson2k) <k2k@narod.ru> Date: Sun, 19 Mar 2017 12:08:13 +0300 MHD_connection_epoll_update_(): updated and simplified conditions required to move connection back to epoll monitoring. Diffstat:
| M | src/microhttpd/connection.c | | | 9 | ++++----- |
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c @@ -3261,11 +3261,10 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection) if ( (0 != (daemon->options & MHD_USE_EPOLL)) && (0 == (connection->epoll_state & MHD_EPOLL_STATE_IN_EPOLL_SET)) && (0 == (connection->epoll_state & MHD_EPOLL_STATE_SUSPENDED)) && - ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY)) || - ( (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) && - ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) || - (connection->read_buffer_size > connection->read_buffer_offset) ) && - (! connection->read_closed) ) ) ) + ( ( (MHD_EVENT_LOOP_INFO_WRITE == connection->event_loop_info) && + (0 == (connection->epoll_state & MHD_EPOLL_STATE_WRITE_READY))) || + ( (MHD_EVENT_LOOP_INFO_READ == connection->event_loop_info) && + (0 == (connection->epoll_state & MHD_EPOLL_STATE_READ_READY)) ) ) ) { /* add to epoll set */ struct epoll_event event;