Skip to content
Snippets Groups Projects
Commit 977175d4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Martin C. Martin's fix for multi-interface connects to non-listening ports.

parent 3ddc7b93
No related branches found
No related tags found
No related merge requests found
...@@ -81,6 +81,10 @@ ...@@ -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, ...@@ -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 */ ...@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment