ITS#2649 don't defer Abandon requests

This commit is contained in:
Howard Chu 2003-09-16 03:57:24 +00:00
parent 2845273093
commit 8f68a6cc31
2 changed files with 5 additions and 2 deletions

View file

@ -2,6 +2,7 @@ OpenLDAP 2.1 Change Log
OpenLDAP 2.1.23 Engineering
Fixed ldappasswd -y handling bug (ITS#2696)
Fixed slapd deferring Abandon (ITS#2649)
Added replica uri keyword (ITS#2594)
Added replica-pidfile, replica-argsfile keywords
Fixed portability issue in ldapsasl (ITS#2691)

View file

@ -1475,12 +1475,14 @@ connection_input(
* use up all the available threads, and don't execute if we're
* currently blocked on output. And don't execute if there are
* already pending ops, let them go first.
*
* But always allow Abandon through; it won't cost much.
*/
if ( conn->c_conn_state == SLAP_C_BINDING
if ( tag != LDAP_REQ_ABANDON && (conn->c_conn_state == SLAP_C_BINDING
|| conn->c_conn_state == SLAP_C_CLOSING
|| conn->c_n_ops_executing >= connection_pool_max/2
|| conn->c_n_ops_pending
|| conn->c_writewaiter)
|| conn->c_writewaiter))
{
int max = conn->c_dn.bv_len ? slap_conn_max_pending_auth
: slap_conn_max_pending;