romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-03 19:14:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

misc: we write *an* IPv6 address

Browse source 
Add it as a "bad word"

Closes #17484
This commit is contained in:
Daniel Stenberg 2025-05-30 00:52:25 +02:00
parent 12d13b84fa
commit b13a7a3ec4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
8 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/scripts/badwords.txt vendored
View file

@ -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

2
docs/KNOWN_BUGS
View file

@ -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.

4
lib/config-win32.h
View file

@ -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

2
lib/curl_addrinfo.c
View file

@ -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

4
lib/curl_config.h.cmake
View file

@ -327,10 +327,10 @@
/* Define to 1 if you have the <ifaddrs.h> 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 */

2
lib/doh.c
View file

@ -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

4
lib/ftp.c
View file

@ -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

4
m4/curl-functions.m4
View file

@ -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])