mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
Martin C. Martin's fix for multi-interface connects to non-listening ports.
This commit is contained in:
parent
3ddc7b9390
commit
977175d4fd
@ -81,6 +81,10 @@
|
|||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* The AIX 3.2.5 system headers define a function called geterrno() which
|
||||||
|
we won't need but that interferes with our function */
|
||||||
|
#undef geterrno
|
||||||
|
|
||||||
static
|
static
|
||||||
int geterrno(void)
|
int geterrno(void)
|
||||||
{
|
{
|
||||||
@ -409,6 +413,8 @@ CURLcode Curl_is_connected(struct connectdata *conn,
|
|||||||
if(err)
|
if(err)
|
||||||
return CURLE_COULDNT_CONNECT;
|
return CURLE_COULDNT_CONNECT;
|
||||||
}
|
}
|
||||||
|
else if(2 == rc)
|
||||||
|
return CURLE_COULDNT_CONNECT;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the connection phase is "done" here, we should attempt to connect
|
* If the connection phase is "done" here, we should attempt to connect
|
||||||
@ -558,6 +564,9 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
|
|||||||
failf(data, "socket error: %d", err);
|
failf(data, "socket error: %d", err);
|
||||||
/* we are _not_ connected, it was a false alert, continue please */
|
/* we are _not_ connected, it was a false alert, continue please */
|
||||||
}
|
}
|
||||||
|
else if(2 == rc)
|
||||||
|
/* waitconnect() returned error */
|
||||||
|
;
|
||||||
else if(data->state.used_interface == Curl_if_multi) {
|
else if(data->state.used_interface == Curl_if_multi) {
|
||||||
/* When running the multi interface, we bail out here */
|
/* When running the multi interface, we bail out here */
|
||||||
rc = 0;
|
rc = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user