Commit 6657caaa authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#9820 fix writewait/idletimeout interaction

Since 88d22a1c 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.
parent 7419950a
Pipeline #4267 failed with stage
in 33 minutes and 53 seconds
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment