More for prev commit

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index ae781817ab0493cbe4dc1806cc7a1bb5cd769d49..969fcf1cc55be7bdcff9a80385190f3542afcadd 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1240,7 +1240,7 @@ int connection_read_activate( ber_socket_t s )
         * thread reads data on it. Otherwise the listener thread will repeatedly
         * submit the same event on it to the pool.
         */
-       rc = slapd_ack_read( s, 0 );
+       rc = slapd_clr_read( s, 0 );
        if ( rc )
                return rc;
 
@@ -1844,7 +1844,7 @@ int connection_write(ber_socket_t s)
 
        assert( connections != NULL );
 
-       slapd_ack_write( s, 0 );
+       slapd_clr_write( s, 0 );
 
        c = connection_get( s );
        if( c == NULL ) {
@@ -1859,7 +1859,9 @@ int connection_write(ber_socket_t s)
        Debug( LDAP_DEBUG_TRACE,
                "connection_write(%d): waking output for id=%lu\n",
                s, c->c_connid, 0 );
+       ldap_pvt_thread_mutex_lock( &c->c_write2_mutex );
        ldap_pvt_thread_cond_signal( &c->c_write2_cv );
+       ldap_pvt_thread_mutex_unlock( &c->c_write2_mutex );
 
        if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_READ, NULL ) ) {
                slapd_set_read( s, 1 );