Backout the input exhaustion change, it loops. Still looking for

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 27c7fda824b247eae73b97b5655009c3ac533042..a5476ad0b3022e9588698d6323cbfbdd06c5c479 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -822,6 +822,7 @@ int connection_read(ber_socket_t s)
        while(!rc)
 #endif
        {
+               /* How do we do this without getting into a busy loop ? */
                rc = connection_input( c );
        }
 
@@ -835,6 +836,10 @@ int connection_read(ber_socket_t s)
                connection_close( c );
        }
 
+       if ( ber_pvt_sb_needs_read( c->c_sb ) )
+               slapd_set_read( s, 1 );
+       if ( ber_pvt_sb_needs_write( c->c_sb ) )
+               slapd_set_write( s, 1 );
        connection_return( c );
        ldap_pvt_thread_mutex_unlock( &connections_mutex );
        return 0;
@@ -1054,6 +1059,10 @@ int connection_write(ber_socket_t s)
 
        ldap_pvt_thread_cond_signal( &c->c_write_cv );
 
+       if ( ber_pvt_sb_needs_read( c->c_sb ) )
+               slapd_set_read( s, 1 );
+       if ( ber_pvt_sb_needs_write( c->c_sb ) )
+               slapd_set_write( s, 1 );
        connection_return( c );
        ldap_pvt_thread_mutex_unlock( &connections_mutex );
        return 0;