upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-01 20:49:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6548,#7092 don't pass hangup events to reader thread

Browse source
This commit is contained in:
Howard Chu 2011-11-19 13:57:56 -08:00
parent 7be5837dc0
commit 42a7fcf19a
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
servers/slapd/daemon.c
View file

@ -2784,25 +2784,22 @@ loop:
}
}
/* If event is a read */
if ( SLAP_EVENT_IS_READ( i ))
if ( SLAP_EVENT_IS_READ( i )) {
r = 1;
if ( r || !w ) {
Debug( LDAP_DEBUG_CONNS,
"daemon: read active on %d\n",
fd, 0, 0 );
if ( r ) {
SLAP_EVENT_CLR_READ( i );
} else {
#ifdef HAVE_EPOLL
/* Don't keep reporting the hangup
*/
if ( SLAP_SOCK_IS_ACTIVE( tid, fd )) {
SLAP_EPOLL_SOCK_SET( tid, fd, EPOLLET );
}
#endif
}
SLAP_EVENT_CLR_READ( i );
connection_read_activate( fd );
} else if ( !w ) {
#ifdef HAVE_EPOLL
/* Don't keep reporting the hangup
*/
if ( SLAP_SOCK_IS_ACTIVE( tid, fd )) {
SLAP_EPOLL_SOCK_SET( tid, fd, EPOLLET );
}
#endif
}
}
}