Commit 608d161b authored by Luo Jinghua's avatar Luo Jinghua Committed by Jay Satiro
Browse files

resolve: enable protocol family logic for synthesized IPv6 

- Enable protocol family logic for IPv6 resolves even when support
for synthesized addresses is enabled.

This is a follow up to the parent commit that added support for
synthesized IPv6 addresses from IPv4 on iOS/OS X. The protocol family
logic needed for IPv6 was inadvertently excluded if support for
synthesized addresses was enabled.

Bug: https://github.com/curl/curl/issues/863
Ref: https://github.com/curl/curl/pull/866
Ref: https://github.com/curl/curl/pull/867
parent 01a49a76

lib/asyn-thread.c

+3 −2
Original line number Diff line number Diff line
@@ -616,7 +616,10 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, 
  if(Curl_inet_pton(AF_INET6, hostname, &in6) > 0)

    /* This is an IPv6 address literal */

    return Curl_ip2addr(AF_INET6, &in6, hostname, port);

#endif /* CURLRES_IPV6 */

#endif /* !USE_RESOLVE_ON_IPS */



#ifdef CURLRES_IPV6

  /*

   * Check if a limited name resolve has been requested.

   */
@@ -635,9 +638,7 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, 
  if((pf != PF_INET) && !Curl_ipv6works())

    /* The stack seems to be a non-IPv6 one */

    pf = PF_INET;



#endif /* CURLRES_IPV6 */

#endif /* USE_RESOLVE_ON_IPS */



  memset(&hints, 0, sizeof(hints));

  hints.ai_family = pf;