Don't set ndelay on socket connect if no timeout was specified

This commit is contained in:
Howard Chu 2005-10-08 18:19:50 +00:00
parent 5420344f05
commit fc79957ad6

View file

@ -232,11 +232,11 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
osip_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
s, opt_tv ? tv.tv_sec : -1L, async);
if ( ldap_pvt_ndelay_on(ld, s) == -1 )
if ( opt_tv && ldap_pvt_ndelay_on(ld, s) == -1 )
return ( -1 );
if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
if ( ldap_pvt_ndelay_off(ld, s) == -1 )
if ( opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 )
return ( -1 );
return ( 0 );
}