Commit 92835ca5 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

connect: avoid skipping an IPv4 address 

... in case the protocol versions are mixed in a DNS response
(IPv6 -> IPv4 -> IPv6).

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1187531#c3
parent 5d87b1f2

lib/connect.c

+6 −2
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static CURLcode trynextip(struct connectdata *conn, 
                          int sockindex,

                          int tempindex)

{

  const int other = tempindex ^ 1;

  CURLcode result = CURLE_COULDNT_CONNECT;



  /* First clean up after the failed socket.
@@ -572,8 +573,11 @@ static CURLcode trynextip(struct connectdata *conn, 
    }



    while(ai) {

      if(conn->tempaddr[other]) {

        /* we can safely skip addresses of the other protocol family */

        while(ai && ai->ai_family != family)

          ai = ai->ai_next;

      }



      if(ai) {

        result = singleipconnect(conn, ai, &conn->tempsock[tempindex]);