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 1e7a09976fbe81241225db73f66b73dfd62f012f..66bfd3c29309e7dec3f35c2a2d2a9fb6f88721af 100644 (file)
--- 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;
                }