badwords: use hostname, not host name

and username, filename - consistently. Fixed the patterns in
badwords.txt to catch these.

Closes #12888
This commit is contained in:
Daniel Stenberg 2024-02-06 23:43:41 +01:00
parent bdb0bf4782
commit dc3eb678da
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
37 changed files with 116 additions and 117 deletions

View file

@ -25,8 +25,8 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NETRC, long level);
# DESCRIPTION
This parameter controls the preference *level* of libcurl between using
user names and passwords from your *~/.netrc* file, relative to user names
and passwords in the URL supplied with CURLOPT_URL(3).
usernames and passwords from your *~/.netrc* file, relative to usernames and
passwords in the URL supplied with CURLOPT_URL(3).
On Windows, libcurl uses the file as *%HOME%/_netrc*. If *%HOME%* is
not set on Windows, libcurl falls back to *%USERPROFILE%*.
@ -34,11 +34,11 @@ not set on Windows, libcurl falls back to *%USERPROFILE%*.
You can also tell libcurl a different filename to use with
CURLOPT_NETRC_FILE(3).
libcurl uses a user name (and supplied or prompted password) supplied with
libcurl uses a username (and supplied or prompted password) supplied with
CURLOPT_USERPWD(3) or CURLOPT_USERNAME(3) in preference to any of
the options controlled by this parameter.
Only machine name, user name and password are taken into account (init macros
Only machine name, username and password are taken into account (init macros
and similar things are not supported).
libcurl does not verify that the file has the correct properties set (as the
@ -53,15 +53,15 @@ libcurl ignores the *.netrc* file. This is the default.
## CURL_NETRC_OPTIONAL (1)
The use of the *.netrc* file is optional, and information in the URL is to
be preferred. The file is scanned for the host and user name (to find the
password only) or for the host only, to find the first user name and password
be preferred. The file is scanned for the host and username (to find the
password only) or for the host only, to find the first username and password
after that *machine*, which ever information is not specified.
## CURL_NETRC_REQUIRED (2)
The use of the *.netrc* file is required, and any credential information
present in the URL is ignored. The file is scanned for the host and user name
(to find the password only) or for the host only, to find the first user name
present in the URL is ignored. The file is scanned for the host and username
(to find the password only) or for the host only, to find the first username
and password after that *machine*, which ever information is not
specified.
@ -74,7 +74,7 @@ Each field is provided as a sequence of letters that ends with a space or
newline. Starting in 7.84.0, libcurl also supports quoted strings. They start
and end with double quotes and support the escaped special letters ", n,
r, and t. Quoted strings are the only way a space character can be used in
a user name or password.
a username or password.
## machine \<name\>
@ -94,7 +94,7 @@ add a line similar to this in the end:
## login \<name\>
The user name string for the remote machine.
The username string for the remote machine.
## password \<secret\>