romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-05 02:47:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

This fixed yet another connect problem with the multi interface and ipv4

Browse source 
stack. Kjetil Jacobsen reported and verified the fix.
This commit is contained in:
Daniel Stenberg 2003-01-09 14:52:51 +00:00
parent c94ba66310
commit 6f35ed51dc
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/connect.c
View file

@ -176,10 +176,9 @@ int waitconnect(int sockfd, /* socket */
/* timeout, no connect today */
return 1;
if(FD_ISSET(sockfd, &errfd)) {
if(FD_ISSET(sockfd, &errfd))
/* error condition caught */
return 2;
}
/* we have a connect! */
return 0;
@ -651,6 +650,15 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
}
}
/* The '1 == rc' comes from the waitconnect(), and not from connect().
We can be sure of this since connect() cannot return 1. */
if((1 == rc) && (data->state.used_interface == Curl_if_multi)) {
/* Timeout when running the multi interface, we return here with a
CURLE_OK return code. */
rc = 0;
break;
}
if(0 == rc) {
int err = socketerror(sockfd);
if ((0 == err) || (EISCONN == err)) {