mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
revert epoll edge-triggered listening, just use it to silence hangup events
This commit is contained in:
parent
0ebe4a62ed
commit
e80731bc19
@ -215,7 +215,7 @@ static struct slap_daemon {
|
||||
int rc; \
|
||||
SLAP_EPOLL_SOCK_IX((s)) = slap_daemon.sd_nfds; \
|
||||
SLAP_EPOLL_SOCK_EP((s)).data.ptr = (l) ? (l) : (void *)(&SLAP_EPOLL_SOCK_IX(s)); \
|
||||
SLAP_EPOLL_SOCK_EV((s)) = EPOLLIN|EPOLLET; \
|
||||
SLAP_EPOLL_SOCK_EV((s)) = EPOLLIN; \
|
||||
rc = epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_ADD, \
|
||||
(s), &SLAP_EPOLL_SOCK_EP((s))); \
|
||||
if ( rc == 0 ) { \
|
||||
@ -2545,6 +2545,11 @@ slapd_daemon_task(
|
||||
} else if ( !w ) {
|
||||
Debug( LDAP_DEBUG_CONNS,
|
||||
"daemon: hangup on %d\n", fd, 0, 0 );
|
||||
#ifdef HAVE_EPOLL
|
||||
/* Don't keep reporting the hangup
|
||||
*/
|
||||
SLAP_EPOLL_SOCK_SET( fd, EPOLLET );
|
||||
#endif
|
||||
connection_hangup( fd );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user