From: Daniel Stenberg Date: Thu, 29 May 2025 22:52:25 +0000 (+0200) Subject: misc: we write *an* IPv6 address X-Git-Tag: curl-8_14_1~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b13a7a3ec44315dc3223a0f99b529256fbab970e;p=thirdparty%2Fcurl.git misc: we write *an* IPv6 address Add it as a "bad word" Closes #17484 --- diff --git a/.github/scripts/badwords.txt b/.github/scripts/badwords.txt index 8451e60fb9..741e5376fc 100644 --- a/.github/scripts/badwords.txt +++ b/.github/scripts/badwords.txt @@ -33,6 +33,8 @@ aren't:are not a html: an html a http: an http a ftp: an ftp + a IPv4: an IPv4 + a IPv6: an IPv6 url =URL internet\b=Internet isation:ization diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 7ed5ee39db..6b2a7b81b1 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -447,7 +447,7 @@ problems may have been fixed or changed somewhat since this was written. 10.1 --interface with link-scoped IPv6 address When you give the `--interface` option telling curl to use a specific - interface for its outgoing traffic in combination with a IPv6 address in the + interface for its outgoing traffic in combination with an IPv6 address in the URL that uses a link-local scope, curl might pick the wrong address from the named interface and the subsequent transfer fails. diff --git a/lib/config-win32.h b/lib/config-win32.h index f62f5bece3..c9ba42762d 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -225,9 +225,9 @@ /* Vista */ #if (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600) && !defined(UNDER_CE) -/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ +/* Define to 1 if you have an IPv6 capable working inet_ntop function. */ #define HAVE_INET_NTOP 1 -/* Define to 1 if you have a IPv6 capable working inet_pton function. */ +/* Define to 1 if you have an IPv6 capable working inet_pton function. */ #define HAVE_INET_PTON 1 #endif diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index ad1769fdb0..8bfde69988 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -218,7 +218,7 @@ Curl_getaddrinfo_ex(const char *nodename, * * This function returns a pointer to the first element of a newly allocated * Curl_addrinfo struct linked list filled with the data of a given hostent. - * Curl_addrinfo is meant to work like the addrinfo struct does for a IPv6 + * Curl_addrinfo is meant to work like the addrinfo struct does for an IPv6 * stack, but usable also for IPv4, all hosts and environments. * * The memory allocated by this function *MUST* be free'd later on calling diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 4b5c4da30f..efaa8a4594 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -327,10 +327,10 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_IFADDRS_H 1 -/* Define to 1 if you have a IPv6 capable working inet_ntop function. */ +/* Define to 1 if you have an IPv6 capable working inet_ntop function. */ #cmakedefine HAVE_INET_NTOP 1 -/* Define to 1 if you have a IPv6 capable working inet_pton function. */ +/* Define to 1 if you have an IPv6 capable working inet_pton function. */ #cmakedefine HAVE_INET_PTON 1 /* Define to 1 if symbol `sa_family_t' exists */ diff --git a/lib/doh.c b/lib/doh.c index e2d3d6ee2c..9f408402a0 100644 --- a/lib/doh.c +++ b/lib/doh.c @@ -921,7 +921,7 @@ static void doh_show(struct Curl_easy *data, * This function returns a pointer to the first element of a newly allocated * Curl_addrinfo struct linked list filled with the data from a set of DoH * lookups. Curl_addrinfo is meant to work like the addrinfo struct does for - * a IPv6 stack, but usable also for IPv4, all hosts and environments. + * an IPv6 stack, but usable also for IPv4, all hosts and environments. * * The memory allocated by this function *MUST* be free'd later on calling * Curl_freeaddrinfo(). For each successful call to this function there diff --git a/lib/ftp.c b/lib/ftp.c index 04c0ad7baa..09a31d814a 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1146,7 +1146,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data, #ifdef USE_IPV6 if(!conn->bits.ftp_use_eprt && conn->bits.ipv6) - /* EPRT is disabled but we are connected to a IPv6 host, so we ignore the + /* EPRT is disabled but we are connected to an IPv6 host, so we ignore the request and enable EPRT again! */ conn->bits.ftp_use_eprt = TRUE; #endif @@ -1278,7 +1278,7 @@ static CURLcode ftp_state_use_pasv(struct Curl_easy *data, #ifdef PF_INET6 if(!conn->bits.ftp_use_epsv && conn->bits.ipv6) - /* EPSV is disabled but we are connected to a IPv6 host, so we ignore the + /* EPSV is disabled but we are connected to an IPv6 host, so we ignore the request and enable EPSV again! */ conn->bits.ftp_use_epsv = TRUE; #endif diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index 7c5588cc00..79bb0ab746 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -2357,7 +2357,7 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_NTOP], [ test "$tst_works_inet_ntop" != "no"; then AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_INET_NTOP, 1, - [Define to 1 if you have a IPv6 capable working inet_ntop function.]) + [Define to 1 if you have an IPv6 capable working inet_ntop function.]) curl_cv_func_inet_ntop="yes" else AC_MSG_RESULT([no]) @@ -2511,7 +2511,7 @@ AC_DEFUN([CURL_CHECK_FUNC_INET_PTON], [ test "$tst_works_inet_pton" != "no"; then AC_MSG_RESULT([yes]) AC_DEFINE_UNQUOTED(HAVE_INET_PTON, 1, - [Define to 1 if you have a IPv6 capable working inet_pton function.]) + [Define to 1 if you have an IPv6 capable working inet_pton function.]) curl_cv_func_inet_pton="yes" else AC_MSG_RESULT([no])