From 9e6d6f6d16d9f1b19de7369315b1a186388b5c0e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 4 Nov 2017 13:32:14 +0100 Subject: 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. --- lib/connect.c | 7 +++---- 1 file 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: -- cgit v1.2.1