From: Howard Chu Date: Mon, 17 Aug 2009 11:28:25 +0000 (+0000) Subject: More for #6220, don't timeout idle connections when writetimeout is X-Git-Tag: ACLCHECK_0~319 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a975c6145152c890abe4378cff1d01005da01b0d;p=openldap More for #6220, don't timeout idle connections when writetimeout is set and idletimeout is not. --- diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 897a50c3bc..b8c7cf05d7 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -242,7 +242,8 @@ int connections_timeout_idle(time_t now) continue; } - if( difftime( c->c_activitytime+global_idletimeout, now) < 0 ) { + if( global_idletimeout && + difftime( c->c_activitytime+global_idletimeout, now) < 0 ) { /* close it */ connection_closing( c, "idletimeout" ); connection_close( c );