From 48039c00c69f7c9860574bae8005ae328462de6f Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 12 Apr 2022 17:28:11 +0100 Subject: [PATCH] ITS#9820 fix writewait/idletimeout interaction Since 88d22a1ca3b28e10e6557e8aebbd75dd61fed511 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. --- servers/slapd/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 1e7a09976f..66bfd3c293 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -212,7 +212,7 @@ int connections_timeout_idle(time_t now) /* Don't timeout a slow-running request or a persistent * 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 ) { continue; } @@ -244,7 +244,7 @@ void connections_drop() /* Don't close a slow-running request or a persistent * 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 ) { continue; } -- 2.47.2