From: Howard Chu <hyc@openldap.org>
Date: Tue, 12 Apr 2022 16:28:11 +0000 (+0100)
Subject: ITS#9820 fix writewait/idletimeout interaction
X-Git-Tag: OPENLDAP_REL_ENG_2_5_12~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48039c00c69f7c9860574bae8005ae328462de6f;p=thirdparty%2Fopenldap.git

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.
---

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;
 		}