diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-11-04 13:32:14 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-11-09 07:59:04 +0100 |
| commit | 6b12beb25a8bc66d724a4d7808a4eee97b865e02 (patch) | |
| tree | ff41a26f064a326ea2bff0a06e1c2a0078d9b1ed | |
| parent | 63b8fbbbc02634ef6710067a71d6be24e1af9dd3 (diff) | |
connect: store IPv6 connection status after valid connection
... previously it would store it already in the happy eyeballs stage
which could lead to the IPv6 bit being set for an IPv4 connection,
leading to curl not wanting to do EPSV=>PASV for FTP transfers.
Closes #2053
| -rwxr-xr-x | lib/connect.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/connect.c b/lib/connect.c index 218bbcc78..84a63aefd 100755 --- a/lib/connect.c +++ b/lib/connect.c @@ -785,6 +785,9 @@ CURLcode Curl_is_connected(struct connectdata *conn, conn->sock[sockindex] = conn->tempsock[i]; conn->ip_addr = conn->tempaddr[i]; conn->tempsock[i] = CURL_SOCKET_BAD; +#ifdef ENABLE_IPV6 + conn->bits.ipv6 = (conn->ip_addr->ai_family == AF_INET6)?TRUE:FALSE; +#endif /* close the other socket, if open */ if(conn->tempsock[other] != CURL_SOCKET_BAD) { @@ -1097,10 +1100,6 @@ static CURLcode singleipconnect(struct connectdata *conn, return CURLE_OK; } -#ifdef ENABLE_IPV6 - conn->bits.ipv6 = (addr.family == AF_INET6)?TRUE:FALSE; -#endif - if(-1 == rc) { switch(error) { case EINPROGRESS: |