Unverified Commit 6b12beb2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 63b8fbbb

lib/connect.c

+3 −4
Original line number Diff line number Diff line
@@ -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: