upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9820 fix writewait/idletimeout interaction

Browse source 
Since 88d22a1ca3 the writewait check
was moved out of connections_timeout_idle() but the connection loop
was still testing the writewait flag. That test is no longer relevant.
This commit is contained in:
Howard Chu 2022-04-12 17:28:11 +01:00 committed by Quanah Gibson-Mount
parent 7419950aa3
commit 6657caaad8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/connection.c
View file

@ -212,7 +212,7 @@ int connections_timeout_idle(time_t now)
/* Don't timeout a slow-running request or a persistent /* Don't timeout a slow-running request or a persistent
* outbound connection. * outbound connection.
*/ */
if((( c->c_n_ops_executing || c->c_n_ops_async ) && !c->c_writewaiter) if( c->c_n_ops_executing || c->c_n_ops_async
|| c->c_conn_state == SLAP_C_CLIENT ) { || c->c_conn_state == SLAP_C_CLIENT ) {
continue; continue;
} }
@ -244,7 +244,7 @@ void connections_drop()
/* Don't close a slow-running request or a persistent /* Don't close a slow-running request or a persistent
* outbound connection. * outbound connection.
*/ */
if((( c->c_n_ops_executing || c->c_n_ops_async ) && !c->c_writewaiter) if( c->c_n_ops_executing || c->c_n_ops_async
|| c->c_conn_state == SLAP_C_CLIENT ) { || c->c_conn_state == SLAP_C_CLIENT ) {
continue; continue;
} }