Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / request.c

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index ab4463dd6a5f1d44368a25cde28976a48922b876..52c21a0123bdbbbfe711e135aea52ed72b46fc05 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -202,6 +202,7 @@ ldap_int_flush_request(
 
                /* sent -- waiting for a response */
                ldap_mark_select_read( ld, lc->lconn_sb );
+               ldap_clear_select_write( ld, lc->lconn_sb );
        }
        return 0;
 }
@@ -260,7 +261,7 @@ ldap_send_server_request(
                ber_sockbuf_ctrl( lc->lconn_sb, LBER_SB_OPT_GET_FD, &sd );
 
                /* poll ... */
-               switch ( ldap_int_poll( ld, sd, &tv ) ) {
+               switch ( ldap_int_poll( ld, sd, &tv, 1 ) ) {
                case 0:
                        /* go on! */
                        lc->lconn_status = LDAP_CONNST_CONNECTED;