diff options
| author | Curl Upstream <curl-library@lists.haxx.se> | 2022-10-26 06:12:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-31 20:11:01 (GMT) |
| commit | ec122fff08ab9a8e56fb90126ecedb99c759011b (patch) | |
| tree | 372b5f86f3fad307de965e11187e51ef0860960b /lib/hostip6.c | |
| parent | 9d8f81f4f8ac4a234ced9c446958fdfcaed4faa3 (diff) | |
| download | CMake-ec122fff08ab9a8e56fb90126ecedb99c759011b.zip CMake-ec122fff08ab9a8e56fb90126ecedb99c759011b.tar.gz CMake-ec122fff08ab9a8e56fb90126ecedb99c759011b.tar.bz2 | |
curl 2022-10-26 (cd95ee9f)
Code extracted from:
https://github.com/curl/curl.git
at commit cd95ee9f771361acf241629d2fe5507e308082a2 (curl-7_86_0).
Diffstat (limited to 'lib/hostip6.c')
| -rw-r--r-- | lib/hostip6.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/hostip6.c b/lib/hostip6.c index c2d5f08..c62c254 100644 --- a/lib/hostip6.c +++ b/lib/hostip6.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #include "curl_setup.h" @@ -94,8 +96,8 @@ static void dump_addrinfo(struct connectdata *conn, * non-ares version). * * Returns name information about the given hostname and port number. If - * successful, the 'addrinfo' is returned and the forth argument will point to - * memory we need to free after use. That memory *MUST* be freed with + * successful, the 'addrinfo' is returned and the fourth argument will point + * to memory we need to free after use. That memory *MUST* be freed with * Curl_freeaddrinfo(), nothing else. */ struct Curl_addrinfo *Curl_getaddrinfo(struct Curl_easy *data, @@ -115,7 +117,7 @@ struct Curl_addrinfo *Curl_getaddrinfo(struct Curl_easy *data, *waitp = 0; /* synchronous response only */ - if(Curl_ipv6works(data)) + if((data->conn->ip_version != CURL_IPRESOLVE_V4) && Curl_ipv6works(data)) /* The stack seems to be IPv6-enabled */ pf = PF_UNSPEC; |