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

ITS#5836 more for 1.432, writetimeout wasn't taking effect if

Browse source 
idletimeout wasn't also set. Also, timeout check would keep getting
pushed back if multiple writers were waiting.
This commit is contained in:
Howard Chu 2009-07-06 21:02:28 +00:00
parent 4353379403
commit e6173ac9c2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/daemon.c
View file

@ -957,7 +957,7 @@ slapd_set_write( ber_socket_t s, int wake )
SLAP_SOCK_SET_WRITE( s );
slap_daemon.sd_nwriters++;
}
if (( wake & 2 ) && global_writetimeout ) {
if (( wake & 2 ) && global_writetimeout && !chk_writetime ) {
chk_writetime = slap_get_time();
}
@ -2177,7 +2177,7 @@ slapd_daemon_task(
*/
if ( chk_writetime ) {
tv.tv_sec = global_writetimeout;
tv.tv_usec = global_writetimeout;
tv.tv_usec = 0;
if ( difftime( chk_writetime, now ) < 0 )
check = 2;
} else {
@ -2245,7 +2245,7 @@ slapd_daemon_task(
nfds = SLAP_EVENT_MAX;
if ( global_idletimeout && slap_daemon.sd_nactives ) at = 1;
if (( chk_writetime || global_idletimeout ) && slap_daemon.sd_nactives ) at = 1;
ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex );