luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy-up: OS names

Browse Source 
Use these words and casing more consistently across text, comments and
one curl tool output:
AIX, ALPN, ANSI, BSD, Cygwin, Darwin, FreeBSD, GitHub, HP-UX, Linux,
macOS, MS-DOS, MSYS, MinGW, NTLM, POSIX, Solaris, UNIX, Unix, Unicode,
WINE, WebDAV, Win32, winbind, WinIDN, Windows, Windows CE, Winsock.

Mostly OS names and a few more.

Also a couple of other minor text fixups.

Closes #14360
This commit is contained in:
Viktor Szakats 2024-08-03 01:09:57 +02:00
parent a4ad7dc5a3
commit f81f351b9a
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
146 changed files with 355 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/spellcheck.words vendored
View File

@ -872,7 +872,6 @@ unescape
Unglobbed
Unicode
UNICOS
unix
UnixSockets
UnixWare
unlink
@ -934,14 +933,11 @@ WHATWG
whitespace
Whitespaces
winbind
WinBind
winbuild
winidn
WinIDN
WinLDAP
WinSock
winsock
WinSSL
winssl
Wireshark
wolfSSH

2
CMake/PickyWarnings.cmake
View File

@ -180,7 +180,7 @@ if(PICKY_COMPILER)
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5 AND MINGW)
list(APPEND WPICKY_ENABLE
-Wno-pedantic-ms-format # gcc 4.5 (mingw-only)
-Wno-pedantic-ms-format # gcc 4.5 (MinGW-only)
)
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.8)

2
Makefile.am
View File

@ -190,7 +190,7 @@ pkgadd:
cd $(srcdir)/packages/Solaris && $(MAKE) package
#
# Build a cygwin binary tarball installation file
# Build a Cygwin binary tarball installation file
# resulting .tar.bz2 file will end up at packages/Win32/cygwin
cygwinbin:
$(MAKE) -C packages/Win32/cygwin cygwinbin

12
acinclude.m4
View File

@ -1390,11 +1390,11 @@ AS_HELP_STRING([--without-ca-embed], [Don't embed a default CA bundle]),
dnl CURL_CHECK_WIN32_LARGEFILE
dnl -------------------------------------------------
dnl Check if curl's WIN32 large file will be used
dnl Check if curl's Win32 large file will be used
AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl
AC_MSG_CHECKING([whether build target supports WIN32 file API])
AC_MSG_CHECKING([whether build target supports Win32 file API])
curl_win32_file_api="no"
if test "$curl_cv_native_windows" = "yes"; then
if test x"$enable_largefile" != "xno"; then
@ -1404,7 +1404,7 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
#if !defined(_WIN32_WCE) && (defined(__MINGW32__) || defined(_MSC_VER))
int dummy=1;
#else
WIN32 large file API not supported.
Win32 large file API not supported.
#endif
]])
],[
@ -1418,7 +1418,7 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
#if defined(_WIN32_WCE) || defined(__MINGW32__) || defined(_MSC_VER)
int dummy=1;
#else
WIN32 small file API not supported.
Win32 small file API not supported.
#endif
]])
],[
@ -1447,11 +1447,11 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
dnl CURL_CHECK_WIN32_CRYPTO
dnl -------------------------------------------------
dnl Check if curl's WIN32 crypto lib can be used
dnl Check if curl's Win32 crypto lib can be used
AC_DEFUN([CURL_CHECK_WIN32_CRYPTO], [
AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl
AC_MSG_CHECKING([whether build target supports WIN32 crypto API])
AC_MSG_CHECKING([whether build target supports Win32 crypto API])
curl_win32_crypto_api="no"
if test "$curl_cv_native_windows" = "yes"; then
AC_COMPILE_IFELSE([

10
configure.ac
View File

@ -1152,7 +1152,7 @@ fi
if test "$HAVE_GETHOSTBYNAME" != "1"
then
dnl This is for winsock systems
dnl This is for Winsock systems
if test "$curl_cv_native_windows" = "yes"; then
winsock_LIB="-lws2_32"
if test ! -z "$winsock_LIB"; then
@ -2554,7 +2554,7 @@ case "$OPT_WINIDN" in
esac
if test "$want_winidn" = "yes"; then
dnl winidn library support has been requested
dnl WinIDN library support has been requested
clean_CFLAGS="$CFLAGS"
clean_CPPFLAGS="$CPPFLAGS"
clean_LDFLAGS="$LDFLAGS"
@ -2632,7 +2632,7 @@ AS_HELP_STRING([--without-libidn2],[Disable libidn2 usage]),
[OPT_IDN=$withval])
if test "x$tst_links_winidn" = "xyes"; then
want_idn="no"
AC_MSG_RESULT([no (using winidn instead)])
AC_MSG_RESULT([no (using WinIDN instead)])
else
case "$OPT_IDN" in
no)
@ -3696,7 +3696,7 @@ AC_CHECK_TYPE([bool],[
AC_CHECK_TYPE(sa_family_t,
AC_DEFINE(CURL_SA_FAMILY_T, sa_family_t, [IP address type in sockaddr]),
[
# The windows name?
# The Windows name?
AC_CHECK_TYPE(ADDRESS_FAMILY,
AC_DEFINE(CURL_SA_FAMILY_T, ADDRESS_FAMILY, [IP address type in sockaddr]),
AC_DEFINE(CURL_SA_FAMILY_T, unsigned short, [IP address type in sockaddr]),
@ -3947,7 +3947,7 @@ if test "$want_pthreads" != "no"; then
AC_CHECK_FUNC(pthread_create, [USE_THREADS_POSIX=1] )
LIBS="$save_LIBS"
dnl on HPUX, life is more complicated...
dnl on HP-UX, life is more complicated...
case $host in
*-hp-hpux*)
dnl it doesn't actually work without -lpthread

2
docs/CODE_STYLE.md
View File

@ -271,7 +271,7 @@ DEBUGF(infof(data, "Curl_pp_readresp_ %d bytes of trailing "
Use **#ifdef HAVE_FEATURE** to do conditional code. We avoid checking for
particular operating systems or hardware in the #ifdef lines. The HAVE_FEATURE
shall be generated by the configure script for unix-like systems and they are
shall be generated by the configure script for Unix-like systems and they are
hard-coded in the `config-[system].h` files for the others.
We also encourage use of macros/functions that possibly are empty or defined

2
docs/DEPRECATE.md
View File

@ -32,6 +32,6 @@ May 2025 are: BearSSL and Secure Transport.
- Support for systems without 64-bit data types
- NSS
- gskit
- mingw v1
- MinGW v1
- NTLM_WB
- space-separated `NOPROXY` patterns

16
docs/FAQ
View File

@ -84,8 +84,8 @@ FAQ
5.1 Is libcurl thread-safe?
5.2 How can I receive all data into a large memory chunk?
5.3 How do I fetch multiple files with libcurl?
5.4 Does libcurl do Winsock initialization on win32 systems?
5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
5.4 Does libcurl do Winsock initialization on Win32 systems?
5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on Win32 ?
5.6 What about Keep-Alive or persistent connections?
5.7 Link errors when building libcurl on Windows
5.8 libcurl.so.X: open failed: No such file or directory
@ -424,7 +424,7 @@ FAQ
curl can be built to use one of the following SSL alternatives: OpenSSL,
LibreSSL, BoringSSL, AWS-LC, GnuTLS, wolfSSL, mbedTLS, Secure Transport
(native iOS/OS X), Schannel (native Windows), BearSSL or Rustls. They all
(native iOS/macOS), Schannel (native Windows), BearSSL or Rustls. They all
have their pros and cons, and we try to maintain a comparison of them here:
https://curl.se/docs/ssl-compared.html
@ -566,7 +566,7 @@ FAQ
3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP?
curl adheres to the HTTP spec, which basically means you can play with *any*
protocol that is built on top of HTTP. Protocols such as SOAP, WEBDAV and
protocol that is built on top of HTTP. Protocols such as SOAP, WebDAV and
XML-RPC are all such ones. You can use -X to set custom requests and -H to
set custom headers (or replace internally generated ones).
@ -604,7 +604,7 @@ FAQ
curl -d ' with spaces ' example.com
Exactly what kind of quotes and how to do this is entirely up to the shell
or command line interpreter that you are using. For most unix shells, you
or command line interpreter that you are using. For most Unix shells, you
can more or less pick either single (') or double (") quotes. For
Windows/DOS command prompts you must use double (") quotes, and if the
option string contains inner double quotes you can escape them with a
@ -1174,11 +1174,11 @@ FAQ
only reusable, but you are even encouraged to reuse it if you can, as that
will enable libcurl to use persistent connections.
5.4 Does libcurl do Winsock initialization on win32 systems?
5.4 Does libcurl do Winsock initialization on Win32 systems?
Yes, if told to in the curl_global_init() call.
5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ?
5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on Win32 ?
Yes, but you cannot open a FILE * and pass the pointer to a DLL and have
that DLL use the FILE * (as the DLL and the client application cannot access
@ -1352,7 +1352,7 @@ FAQ
then you have to work with what you are given. The LIST output format is
entirely at the server's own liking and the NLST output does not reveal any
types and in many cases does not even include all the directory entries.
Also, both LIST and NLST tend to hide unix-style hidden files (those that
Also, both LIST and NLST tend to hide Unix-style hidden files (those that
start with a dot) by default so you need to do "LIST -a" or similar to see
them.

2
docs/FEATURES.md
View File

@ -44,7 +44,7 @@ SPDX-License-Identifier: curl
- TCP Fast Open
- DNS cache (that can be shared between transfers)
- non-blocking single-threaded parallel transfers
- unix domain sockets to server or proxy
- Unix domain sockets to server or proxy
- DNS-over-HTTPS
- uses non-blocking name resolves
- selectable name resolver backend

6
docs/INSTALL.md
View File

@ -253,7 +253,7 @@ Note: The pre-processor settings can be found using the Visual Studio IDE
under "Project -> Properties -> Configuration Properties -> C/C++ ->
Preprocessor".
## Using BSD-style lwIP instead of Winsock TCP/IP stack in Win32 builds
## Using BSD-style lwIP instead of Winsock TCP/IP stack in Windows builds
In order to compile libcurl and curl using BSD-style lwIP TCP/IP stack it is
necessary to make the definition of the preprocessor symbol `USE_LWIPSOCK`
@ -521,14 +521,14 @@ disabling support for some feature (run `./configure --help` to see them all):
- `--disable-mime` (MIME API)
- `--disable-netrc` (.netrc file)
- `--disable-ntlm` (NTLM authentication)
- `--disable-ntlm-wb` (NTLM WinBind)
- `--disable-ntlm-wb` (NTLM winbind)
- `--disable-progress-meter` (graphical progress meter in library)
- `--disable-proxy` (HTTP and SOCKS proxies)
- `--disable-pthreads` (multi-threading)
- `--disable-socketpair` (socketpair for asynchronous name resolving)
- `--disable-threaded-resolver` (threaded name resolver)
- `--disable-tls-srp` (Secure Remote Password authentication for TLS)
- `--disable-unix-sockets` (UNIX sockets)
- `--disable-unix-sockets` (Unix sockets)
- `--disable-verbose` (eliminates debugging strings and error code strings)
- `--disable-versioned-symbols` (versioned symbols)
- `--enable-symbol-hiding` (eliminates unneeded symbols in the shared library)

2
docs/INTERNALS.md
View File

@ -35,7 +35,7 @@ versions of libs and build tools.
- MIT Kerberos 1.2.4
- Heimdal ?
- nghttp2 1.15.0
- WinSock 2.2 (on Windows 95+ and Windows CE .NET 4.1+)
- Winsock 2.2 (on Windows 95+ and Windows CE .NET 4.1+)
## Build tools

20
docs/KNOWN_BUGS
View File

@ -41,7 +41,7 @@ problems may have been fixed or changed somewhat since this was written.
5.2 curl-config --libs contains private details
5.3 building for old macOS fails with gcc
5.5 cannot handle Unicode arguments in non-Unicode builds on Windows
5.6 cygwin: make install installs curl-config.1 twice
5.6 Cygwin: make install installs curl-config.1 twice
5.11 configure --with-gssapi with Heimdal is ignored on macOS
5.12 flaky CI builds
5.13 long paths are not fully supported on Windows
@ -49,7 +49,7 @@ problems may have been fixed or changed somewhat since this was written.
5.15 Unicode on Windows
6. Authentication
6.1 NTLM authentication and unicode
6.1 NTLM authentication and Unicode
6.2 MIT Kerberos for Windows build
6.3 NTLM in system context uses wrong name
6.5 NTLM does not support password with § character
@ -73,7 +73,7 @@ problems may have been fixed or changed somewhat since this was written.
9.2 wolfssh: publickey auth does not work
9.3 Remote recursive folder creation with SFTP
9.4 libssh blocking and infinite loop problem
9.5 cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!"
9.5 Cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!"
10. SOCKS
10.3 FTPS over SOCKS
@ -274,7 +274,7 @@ problems may have been fixed or changed somewhat since this was written.
https://curl.se/bug/?i=731
https://curl.se/bug/?i=3747
5.6 cygwin: make install installs curl-config.1 twice
5.6 Cygwin: make install installs curl-config.1 twice
https://github.com/curl/curl/issues/8839
@ -315,19 +315,19 @@ problems may have been fixed or changed somewhat since this was written.
5.15 Unicode on Windows
Passing in a unicode filename with -o:
Passing in a Unicode filename with -o:
https://github.com/curl/curl/issues/11461
Passing in unicode character with -d:
Passing in Unicode character with -d:
https://github.com/curl/curl/issues/12231
6. Authentication
6.1 NTLM authentication and unicode
6.1 NTLM authentication and Unicode
NTLM authentication involving unicode username or password only works
NTLM authentication involving Unicode username or password only works
properly if built with UNICODE defined together with the Schannel
backend. The original problem was mentioned in:
https://curl.se/mail/lib-2009-10/0024.html
@ -471,9 +471,9 @@ problems may have been fixed or changed somewhat since this was written.
https://github.com/curl/curl/issues/8632
9.5 cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!"
9.5 Cygwin: "WARNING: UNPROTECTED PRIVATE KEY FILE!"
Running SCP and SFTP tests on cygwin makes this warning message appear.
Running SCP and SFTP tests on Cygwin makes this warning message appear.
https://github.com/curl/curl/issues/11244

6
docs/SSLCERTS.md
View File

@ -16,7 +16,7 @@ Native SSL
----------
If libcurl was built with Schannel or Secure Transport support (the native SSL
libraries included in Windows and Mac OS X), then this does not apply to
libraries included in Windows and macOS), then this does not apply to
you. Scroll down for details on how the OS-native engines handle SSL
certificates. If you are not sure, then run "curl -V" and read the results. If
the version string says `Schannel` in it, then it was built with Schannel
@ -140,12 +140,12 @@ Transport (Apple's native TLS engine) support, then libcurl still performs
peer certificate verification, but instead of using a CA cert bundle, it uses
the certificates that are built into the OS. These are the same certificates
that appear in the Internet Options control panel (under Windows) or Keychain
Access application (under OS X). Any custom security rules for certificates
Access application (under macOS). Any custom security rules for certificates
are honored.
Schannel runs CRL checks on certificates unless peer verification is disabled.
Secure Transport on iOS runs OCSP checks on certificates unless peer
verification is disabled. Secure Transport on OS X runs either OCSP or CRL
verification is disabled. Secure Transport on macOS runs either OCSP or CRL
checks on certificates if those features are enabled, and this behavior can be
adjusted in the preferences of Keychain Access.

12
docs/TODO
View File

@ -153,7 +153,7 @@
18.6 Option to make -Z merge lined based outputs on stdout
18.7 specify which response codes that make -f/--fail return error
18.9 Choose the name of file in braces for complex URLs
18.10 improve how curl works in a windows console window
18.10 improve how curl works in a Windows console window
18.11 Windows: set attribute 'archive' for completed downloads
18.12 keep running, read instructions from pipe/socket
18.13 Acknowledge Ratelimit headers
@ -202,7 +202,7 @@
1.1 TFO support on Windows
libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and
Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607
macOS. Windows supports TCP Fast Open starting with Windows 10, version 1607
and we should add support for it.
TCP Fast Open is supported on several platforms but not on Windows. Work on
@ -465,7 +465,7 @@
Make sure we do not ever loop because of non-blocking sockets returning
EWOULDBLOCK or similar. Blocking cases include:
- Name resolves on non-windows unless c-ares or the threaded resolver is used.
- Name resolves on non-Windows unless c-ares or the threaded resolver is used.
- The threaded resolver may block on cleanup:
https://github.com/curl/curl/issues/4852
@ -758,7 +758,7 @@
10.4 Certificate-Based Authentication
LDAPS not possible with MAC and Windows with Certificate-Based Authentication
LDAPS not possible with macOS and Windows with Certificate-Based Authentication
https://github.com/curl/curl/issues/9641
@ -1078,7 +1078,7 @@
See https://github.com/curl/curl/issues/221
18.10 improve how curl works in a windows console window
18.10 improve how curl works in a Windows console window
If you pull the scrollbar when transferring with curl in a Windows console
window, the transfer is interrupted and can get disconnected. This can
@ -1334,7 +1334,7 @@
20.4 more platforms supported
Make the test suite work on more platforms. OpenBSD and Mac OS. Remove
Make the test suite work on more platforms. OpenBSD and macOS. Remove
fork()s and it should become even more portable.
20.6 Use the RFC 6265 test suite

2
docs/URL-SYNTAX.md
View File

@ -197,7 +197,7 @@ Transitional Processing. The two standards have a huge overlap but differ
slightly, perhaps most famously in how they deal with the German "double s"
(`ß`).
When winidn is used, curl uses IDNA 2003 Transitional Processing, like the rest
When WinIDN is used, curl uses IDNA 2003 Transitional Processing, like the rest
of Windows.
## Port number

2
docs/cmdline-opts/_ENVIRONMENT.md
View File

@ -87,7 +87,7 @@ names named after the destination connection id (in hex). Do note that these
files can become rather large. Works with the ngtcp2 and quiche QUIC backends.
## `SHELL`
Used on VMS when trying to detect if using a **DCL** or a **unix** shell.
Used on VMS when trying to detect if using a **DCL** or a **Unix** shell.
## `SSL_CERT_DIR` <dir>
If set, it is used as the --capath value. This environment variable is ignored

2
docs/cmdline-opts/cacert.md
View File

@ -27,7 +27,7 @@ curl recognizes the environment variable named 'CURL_CA_BUNDLE' if it is set
and the TLS backend is not Schannel, and uses the given path as a path to a CA
cert bundle. This option overrides that variable.
The windows version of curl automatically looks for a CA certs file named
The Windows version of curl automatically looks for a CA certs file named
'curl-ca-bundle.crt', either in the same directory as curl.exe, or in the
Current Working Directory, or in any folder along your PATH.

2
docs/cmdline-opts/create-dirs.md
View File

@ -21,6 +21,6 @@ mentioned with the --output option combined with the path possibly set with
--output-dir. If the combined output filename uses no directory, or if the
directories it mentions already exist, no directories are created.
Created directories are made with mode 0750 on unix style file systems.
Created directories are made with mode 0750 on Unix-style file systems.
To create remote directories when using FTP or SFTP, try --ftp-create-dirs.

2
docs/cmdline-opts/false-start.md
View File

@ -20,4 +20,4 @@ client starts sending application data before verifying the server's Finished
message, thus saving a round trip when performing a full handshake.
This functionality is currently only implemented in the Secure Transport (on
iOS 7.0 or later, or OS X 10.9 or later) backend.
iOS 7.0 or later, or macOS 10.9 or later) backend.

2
docs/cmdline-opts/socks4.md
View File

@ -21,7 +21,7 @@ Use the specified SOCKS4 proxy. If the port number is not specified, it is
assumed at port 1080. Using this socket type make curl resolve the hostname
and passing the address on to the proxy.
To specify proxy on a unix domain socket, use localhost for host, e.g.
To specify proxy on a Unix domain socket, use localhost for host, e.g.
`socks4://localhost/path/to/socket.sock`
This option overrides any previous use of --proxy, as they are mutually

2
docs/cmdline-opts/socks4a.md
View File

@ -20,7 +20,7 @@ Example:
Use the specified SOCKS4a proxy. If the port number is not specified, it is
assumed at port 1080. This asks the proxy to resolve the hostname.
To specify proxy on a unix domain socket, use localhost for host, e.g.
To specify proxy on a Unix domain socket, use localhost for host, e.g.
`socks4a://localhost/path/to/socket.sock`
This option overrides any previous use of --proxy, as they are mutually

2
docs/cmdline-opts/socks5-hostname.md
View File

@ -19,7 +19,7 @@ Example:
Use the specified SOCKS5 proxy (and let the proxy resolve the hostname). If
the port number is not specified, it is assumed at port 1080.
To specify proxy on a unix domain socket, use localhost for host, e.g.
To specify proxy on a Unix domain socket, use localhost for host, e.g.
`socks5h://localhost/path/to/socket.sock`
This option overrides any previous use of --proxy, as they are mutually

2
docs/cmdline-opts/socks5.md
View File

@ -19,7 +19,7 @@ Example:
Use the specified SOCKS5 proxy - but resolve the hostname locally. If the
port number is not specified, it is assumed at port 1080.
To specify proxy on a unix domain socket, use localhost for host, e.g.
To specify proxy on a Unix domain socket, use localhost for host, e.g.
`socks5://localhost/path/to/socket.sock`
This option overrides any previous use of --proxy, as they are mutually

2
docs/cmdline-opts/use-ascii.md
View File

@ -19,4 +19,4 @@ Example:
Enable ASCII transfer mode. For FTP, this can also be enforced by using a URL
that ends with `;type=A`. This option causes data sent to stdout to be in text
mode for win32 systems.
mode for Win32 systems.

2
docs/examples/anyauthput.c
View File

@ -100,7 +100,7 @@ int main(int argc, char **argv)
fp = fopen(file, "rb");
fstat(FILENO(fp), &file_info);
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */

2
docs/examples/ephiperfifo.c
View File

@ -33,7 +33,7 @@
*
* Written by Jeff Pohlmeyer, converted to use epoll by Josh Bialkowski
Requires a linux system with epoll
Requires a Linux system with epoll
When running, the program creates the named pipe "hiper.fifo"

6
docs/examples/ftpgetresp.c
View File

@ -48,17 +48,17 @@ int main(void)
FILE *respfile;
/* local filename to store the file as */
ftpfile = fopen(FTPBODY, "wb"); /* b is binary, needed on win32 */
ftpfile = fopen(FTPBODY, "wb"); /* b is binary, needed on Windows */
/* local filename to store the FTP server's response lines in */
respfile = fopen(FTPHEADERS, "wb"); /* b is binary, needed on win32 */
respfile = fopen(FTPHEADERS, "wb"); /* b is binary, needed on Windows */
curl = curl_easy_init();
if(curl) {
/* Get a file listing from sunet */
curl_easy_setopt(curl, CURLOPT_URL, "ftp://ftp.example.com/");
curl_easy_setopt(curl, CURLOPT_WRITEDATA, ftpfile);
/* If you intend to use this on windows with a libcurl DLL, you must use
/* If you intend to use this on Windows with a libcurl DLL, you must use
CURLOPT_WRITEFUNCTION as well */
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, write_response);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, respfile);

2
docs/examples/ftpupload.c
View File

@ -90,7 +90,7 @@ int main(void)
/* get a FILE * of the same file */
hd_src = fopen(LOCAL_FILE, "rb");
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */

2
docs/examples/ftpuploadfrommem.c
View File

@ -76,7 +76,7 @@ int main(void)
upload.readptr = data;
upload.sizeleft = strlen(data);
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
res = curl_global_init(CURL_GLOBAL_DEFAULT);
/* Check for errors */
if(res != CURLE_OK) {

2
docs/examples/http-post.c
View File

@ -33,7 +33,7 @@ int main(void)
CURL *curl;
CURLcode res;
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */

2
docs/examples/http2-upload.c
View File

@ -32,7 +32,7 @@
#include <sys/stat.h>
#include <errno.h>
/* somewhat unix-specific */
/* somewhat Unix-specific */
#ifndef _MSC_VER
#include <sys/time.h>
#include <unistd.h>

2
docs/examples/httpput-postfields.c
View File

@ -58,7 +58,7 @@ int main(int argc, char **argv)
url = argv[1];
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */

2
docs/examples/httpput.c
View File

@ -82,7 +82,7 @@ int main(int argc, char **argv)
an example! */
hd_src = fopen(file, "rb");
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */

2
docs/examples/multi-legacy.c
View File

@ -30,7 +30,7 @@
#include <stdio.h>
#include <string.h>
/* somewhat unix-specific */
/* somewhat Unix-specific */
#ifndef _WIN32
#include <sys/time.h>
#include <unistd.h>

2
docs/examples/post-callback.c
View File

@ -73,7 +73,7 @@ int main(void)
wt.readptr = data;
wt.sizeleft = strlen(data);
/* In windows, this inits the winsock stuff */
/* In Windows, this inits the Winsock stuff */
res = curl_global_init(CURL_GLOBAL_DEFAULT);
/* Check for errors */
if(res != CURLE_OK) {

2
docs/examples/unixsocket.c
View File

@ -22,7 +22,7 @@
*
***************************************************************************/
/* <DESC>
* Access HTTP server over unix domain socket
* Access HTTP server over Unix domain socket
* </DESC>
*/
#include <stdio.h>

6
docs/libcurl/curl_getenv.md
View File

@ -27,7 +27,7 @@ char *curl_getenv(const char *name);
curl_getenv() is a portable wrapper for the getenv() function, meant to
emulate its behavior and provide an identical interface for all operating
systems libcurl builds on (including win32).
systems libcurl builds on (including Windows).
You must curl_free(3) the returned string when you are done with it.
@ -55,6 +55,6 @@ specified name.
# NOTE
Under unix operating systems, there is no point in returning an allocated
Under Unix operating systems, there is no point in returning an allocated
memory, although other systems does not work properly if this is not done. The
unix implementation thus suffers slightly from the drawbacks of other systems.
Unix implementation thus suffers slightly from the drawbacks of other systems.

2
docs/libcurl/curl_global_init.md
View File

@ -89,7 +89,7 @@ unexpected behaviors.
Initialize the Win32 socket libraries.
The implication here is that if this bit is not set, the initialization of
winsock has to be done by the application or you risk getting undefined
Winsock has to be done by the application or you risk getting undefined
behaviors. This option exists for when the initialization is handled outside
of libcurl so there is no need for libcurl to do it again.

2
docs/libcurl/libcurl-env-dbg.md
View File

@ -98,7 +98,7 @@ the current.
## CURL_TIME
Fake unix timestamp to use for AltSvc, HSTS and CURLINFO variables that are
Fake Unix timestamp to use for AltSvc, HSTS and CURLINFO variables that are
time related.
This variable can also be used to fake the data returned by some CURLINFO

4
docs/libcurl/libcurl-tutorial.md
View File

@ -112,7 +112,7 @@ specified are:
## CURL_GLOBAL_WIN32
which only does anything on Windows machines. When used on a Windows machine,
it makes libcurl initialize the win32 socket stuff. Without having that
it makes libcurl initialize the Win32 socket stuff. Without having that
initialized properly, your program cannot use sockets properly. You should
only do this once for each application, so if your program already does this
or of another library in use does it, you should not tell libcurl to do this
@ -235,7 +235,7 @@ to make your program run fine virtually everywhere.
(CURLOPT_WRITEDATA(3) was formerly known as *CURLOPT_FILE*. Both names still
work and do the same thing).
If you are using libcurl as a win32 DLL, you MUST use the
If you are using libcurl as a Windows DLL, you MUST use the
CURLOPT_WRITEFUNCTION(3) if you set CURLOPT_WRITEDATA(3) - or experience
crashes.

2
docs/libcurl/libcurl.md
View File

@ -95,7 +95,7 @@ See libcurl-ws(3)
# LINKING WITH LIBCURL
On unix-like machines, there is a tool named curl-config that gets installed
On Unix-like machines, there is a tool named curl-config that gets installed
with the rest of the curl stuff when 'make install' is performed.
curl-config is added to make it easier for applications to link with libcurl

2
docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.md
View File

@ -53,7 +53,7 @@ to 2, the operation can never last longer than 2 seconds. Including the
connection phase.
This option may cause libcurl to use the SIGALRM signal to timeout system
calls on builds not using asynch DNS. In unix-like systems, this might cause
calls on builds not using asynch DNS. In Unix-like systems, this might cause
signals to be used unless CURLOPT_NOSIGNAL(3) is set.
# DEFAULT

2
docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.md
View File

@ -54,7 +54,7 @@ With CURLOPT_CONNECTTIMEOUT_MS(3) set to 4000 and CURLOPT_TIMEOUT_MS(3) set to
the connection phase.
This option may cause libcurl to use the SIGALRM signal to timeout system
calls on builds not using asynch DNS. In unix-like systems, this might cause
calls on builds not using asynch DNS. In Unix-like systems, this might cause
signals to be used unless CURLOPT_NOSIGNAL(3) is set.
# DEFAULT

2
docs/libcurl/opts/CURLOPT_HEADERDATA.md
View File

@ -36,7 +36,7 @@ If CURLOPT_WRITEFUNCTION(3) or CURLOPT_HEADERFUNCTION(3) is used,
If neither of those options are set, *pointer* must be a valid FILE * and
it is used by a plain fwrite() to write headers to.
If you are using libcurl as a win32 DLL, you **MUST** use a
If you are using libcurl as a Windows DLL, you **MUST** use a
CURLOPT_WRITEFUNCTION(3) or CURLOPT_HEADERFUNCTION(3) if you set
this option or you might experience crashes.

2
docs/libcurl/opts/CURLOPT_NOSIGNAL.md
View File

@ -27,7 +27,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_NOSIGNAL, long onoff);
If *onoff* is 1, libcurl uses no functions that install signal handlers or
any functions that cause signals to be sent to the process. This option is
here to allow multi-threaded unix applications to still set/use all timeout
here to allow multi-threaded Unix applications to still set/use all timeout
options etc, without risking getting signals.
If this option is set and libcurl has been built with the standard name

2
docs/libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.md
View File

@ -39,7 +39,7 @@ the format of your client certificate used when connecting to an HTTPS proxy.
Supported formats are "PEM" and "DER", except with Secure Transport or
Schannel. OpenSSL (versions 0.9.3 and later), Secure Transport (on iOS 5 or
later, or OS X 10.7 or later) and Schannel support "P12" for PKCS#12-encoded
later, or macOS 10.7 or later) and Schannel support "P12" for PKCS#12-encoded
files.
The application does not have to keep the string around after setting this

2
docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.md
View File

@ -39,7 +39,7 @@ the filename of your private key used for connecting to the HTTPS proxy. The
default format is "PEM" and can be changed with
CURLOPT_PROXY_SSLKEYTYPE(3).
(Windows, iOS and Mac OS X) This option is ignored by Secure Transport and
(Windows, iOS and macOS) This option is ignored by Secure Transport and
Schannel SSL backends because they expect the private key to be already
present in the key chain or PKCS#12 file containing the certificate.

2
docs/libcurl/opts/CURLOPT_SSLCERTTYPE.md
View File

@ -38,7 +38,7 @@ the format of your certificate.
Supported formats are "PEM" and "DER", except with Secure Transport or
Schannel. OpenSSL (versions 0.9.3 and later), Secure Transport (on iOS 5 or
later, or OS X 10.7 or later) and Schannel support "P12" for PKCS#12-encoded
later, or macOS 10.7 or later) and Schannel support "P12" for PKCS#12-encoded
files.
The application does not have to keep the string around after setting this

2
docs/libcurl/opts/CURLOPT_SSLKEY.md
View File

@ -36,7 +36,7 @@ Pass a pointer to a null-terminated string as parameter. The string should be
the filename of your private key. The default format is "PEM" and can be
changed with CURLOPT_SSLKEYTYPE(3).
(Windows, iOS and Mac OS X) This option is ignored by Secure Transport and
(Windows, iOS and macOS) This option is ignored by Secure Transport and
Schannel SSL backends because they expect the private key to be already present
in the key-chain or PKCS#12 file containing the certificate.

2
docs/libcurl/opts/CURLOPT_TIMEOUT.md
View File

@ -55,7 +55,7 @@ With CURLOPT_CONNECTTIMEOUT(3) set to 4 and CURLOPT_TIMEOUT(3) set
to 2, the operation can never last longer than 2 seconds.
This option may cause libcurl to use the SIGALRM signal to timeout system
calls on builds not using asynch DNS. In unix-like systems, this might cause
calls on builds not using asynch DNS. In Unix-like systems, this might cause
signals to be used unless CURLOPT_NOSIGNAL(3) is set.
# DEFAULT

2
docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md
View File

@ -26,7 +26,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_TRANSFERTEXT, long text);
# DESCRIPTION
A parameter set to 1 tells the library to use ASCII mode for FTP transfers,
instead of the default binary transfer. For win32 systems it does not set the
instead of the default binary transfer. For Win32 systems it does not set the
stdout to binary mode. This option can be usable when transferring text data
between systems with different views on certain characters, such as newlines
or similar.

2
docs/libcurl/opts/CURLOPT_URL.md
View File

@ -81,7 +81,7 @@ expected to be a sequence of characters using an ASCII compatible encoding.
If libcurl is built with IDN support, the server name part of the URL can use
an "international name" by using the current encoding (according to locale) or
UTF-8 (when winidn is used; or a Windows Unicode build using libidn2).
UTF-8 (when WinIDN is used; or a Windows Unicode build using libidn2).
If libcurl is built without IDN support, the server name is used exactly as
specified when passed to the name resolver functions.

2
include/curl/curl.h
View File

@ -76,7 +76,7 @@
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)
#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || \
defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H))
/* The check above prevents the winsock2 inclusion if winsock.h already was
/* The check above prevents the winsock2.h inclusion if winsock.h already was
included, since they cannot co-exist without problems */
#include <winsock2.h>
#include <ws2tcpip.h>

8
lib/cf-socket.c
View File

@ -124,7 +124,7 @@ static void tcpnodelay(struct Curl_easy *data, curl_socket_t sockfd)
}
#ifdef SO_NOSIGPIPE
/* The preferred method on Mac OS X (10.2 and later) to prevent SIGPIPEs when
/* The preferred method on macOS (10.2 and later) to prevent SIGPIPEs when
sending data to a dead peer (instead of relying on the 4th argument to send
being MSG_NOSIGNAL). Possibly also existing and in use on other BSD
systems? */
@ -235,7 +235,7 @@ tcpkeepalive(struct Curl_easy *data,
sockfd, SOCKERRNO);
}
#elif defined(TCP_KEEPALIVE)
/* Mac OS X style */
/* macOS style */
optval = curlx_sltosi(data->set.tcp_keepidle);
KEEPALIVE_FACTOR(optval);
if(setsockopt(sockfd, IPPROTO_TCP, TCP_KEEPALIVE,
@ -695,7 +695,7 @@ static CURLcode bindlocal(struct Curl_easy *data, struct connectdata *conn,
else {
/*
* provided dev was no interface (or interfaces are not supported
* e.g. solaris) no ip address and no domain we fail here
* e.g. Solaris) no ip address and no domain we fail here
*/
done = -1;
}
@ -844,7 +844,7 @@ static bool verifyconnect(curl_socket_t sockfd, int *error)
if(0 != getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (void *)&err, &errSize))
err = SOCKERRNO;
#ifdef _WIN32_WCE
/* Old WinCE versions do not support SO_ERROR */
/* Old Windows CE versions do not support SO_ERROR */
if(WSAENOPROTOOPT == err) {
SET_SOCKERRNO(0);
err = 0;

2
lib/config-mac.h
View File

@ -27,7 +27,7 @@
/* =================================================================== */
/* Hand crafted config file for Mac OS 9 */
/* =================================================================== */
/* On Mac OS X you must run configure to generate curl_config.h file */
/* On macOS you must run configure to generate curl_config.h file */
/* =================================================================== */
#ifndef OS

4
lib/config-win32ce.h
View File

@ -25,7 +25,7 @@
***************************************************************************/
/* ================================================================ */
/* lib/config-win32ce.h - Hand crafted config file for windows ce */
/* lib/config-win32ce.h - Hand crafted config file for Windows CE */
/* ================================================================ */
/* ---------------------------------------------------------------- */
@ -279,7 +279,7 @@
#define PACKAGE "curl"
/* ---------------------------------------------------------------- */
/* WinCE */
/* Windows CE */
/* ---------------------------------------------------------------- */
#ifndef UNICODE

2
lib/curl_addrinfo.c
View File

@ -571,7 +571,7 @@ curl_dbg_getaddrinfo(const char *hostname,
#if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS)
/*
* Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and Mac OS X
* Work-arounds the sin6_port is always zero bug on iOS 9.3.2 and macOS
* 10.11.5.
*/
void Curl_addrinfo_set_port(struct Curl_addrinfo *addrinfo, int port)

2
lib/curl_config.h.cmake
View File

@ -677,7 +677,7 @@ ${SIZEOF_TIME_T_CODE}
/* Define if you want to enable POSIX threaded DNS lookup */
#cmakedefine USE_THREADS_POSIX 1
/* Define if you want to enable WIN32 threaded DNS lookup */
/* Define if you want to enable Win32 threaded DNS lookup */
#cmakedefine USE_THREADS_WIN32 1
/* if GnuTLS is enabled */

2
lib/curl_fnmatch.h
View File

@ -31,7 +31,7 @@
/* default pattern matching function
* =================================
* Implemented with recursive backtracking, if you want to use Curl_fnmatch,
* please note that there is not implemented UTF/UNICODE support.
* please note that there is not implemented UTF/Unicode support.
*
* Implemented features:
* '?' notation, does not match UTF characters

6
lib/curl_multibyte.h
View File

@ -39,12 +39,12 @@ char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w);
* Macros curlx_convert_UTF8_to_tchar(), curlx_convert_tchar_to_UTF8()
* and curlx_unicodefree() main purpose is to minimize the number of
* preprocessor conditional directives needed by code using these
* to differentiate UNICODE from non-UNICODE builds.
* to differentiate Unicode from non-Unicode builds.
*
* In the case of a non-UNICODE build the tchar strings are char strings that
* In the case of a non-Unicode build the tchar strings are char strings that
* are duplicated via strdup and remain in whatever the passed in encoding is,
* which is assumed to be UTF-8 but may be other encoding. Therefore the
* significance of the conversion functions is primarily for UNICODE builds.
* significance of the conversion functions is primarily for Unicode builds.
*
* Allocated memory should be free'd with curlx_unicodefree().
*

12
lib/curl_ntlm_core.c
View File

@ -534,13 +534,13 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_hash(const char *user, size_t userlen,
/*
* Curl_ntlm_core_mk_ntlmv2_resp()
*
* This creates the NTLMv2 response as set in the ntlm type-3 message.
* This creates the NTLMv2 response as set in the NTLM type-3 message.
*
* Parameters:
*
* ntlmv2hash [in] - The ntlmv2 hash (16 bytes)
* ntlmv2hash [in] - The NTLMv2 hash (16 bytes)
* challenge_client [in] - The client nonce (8 bytes)
* ntlm [in] - The ntlm data struct being used to read TargetInfo
* ntlm [in] - The NTLM data struct being used to read TargetInfo
and Server challenge received in the type-2 message
* ntresp [out] - The address where a pointer to newly allocated
* memory holding the NTLMv2 response.
@ -629,11 +629,11 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
/*
* Curl_ntlm_core_mk_lmv2_resp()
*
* This creates the LMv2 response as used in the ntlm type-3 message.
* This creates the LMv2 response as used in the NTLM type-3 message.
*
* Parameters:
*
* ntlmv2hash [in] - The ntlmv2 hash (16 bytes)
* ntlmv2hash [in] - The NTLMv2 hash (16 bytes)
* challenge_client [in] - The client nonce (8 bytes)
* challenge_client [in] - The server challenge (8 bytes)
* lmresp [out] - The LMv2 response (24 bytes)
@ -657,7 +657,7 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash,
if(result)
return result;
/* Concatenate the HMAC MD5 output with the client nonce */
/* Concatenate the HMAC MD5 output with the client nonce */
memcpy(lmresp, hmac_output, 16);
memcpy(lmresp + 16, challenge_client, 8);

10
lib/curl_setup.h
View File

@ -319,7 +319,7 @@
/* curl uses its own printf() function internally. It understands the GNU
* format. Use this format, so that is matches the GNU format attribute we
* use with the mingw compiler, allowing it to verify them at compile-time.
* use with the MinGW compiler, allowing it to verify them at compile-time.
*/
#ifdef __MINGW32__
# undef CURL_FORMAT_CURL_OFF_T
@ -444,7 +444,7 @@
#endif
/*
* Large file (>2Gb) support using WIN32 functions.
* Large file (>2Gb) support using Win32 functions.
*/
#ifdef USE_WIN32_LARGE_FILES
@ -467,7 +467,7 @@
#endif
/*
* Small file (<2Gb) support using WIN32 functions.
* Small file (<2Gb) support using Win32 functions.
*/
#ifdef USE_WIN32_SMALL_FILES
@ -816,7 +816,7 @@
#if defined(__LWIP_OPT_H__) || defined(LWIP_HDR_OPT_H)
# if defined(SOCKET) || defined(USE_WINSOCK)
# error "WinSock and lwIP TCP/IP stack definitions shall not coexist!"
# error "Winsock and lwIP TCP/IP stack definitions shall not coexist!"
# endif
#endif
@ -854,7 +854,7 @@ Therefore we specify it explicitly. https://github.com/curl/curl/pull/258
#define FOPEN_WRITETEXT "wt"
#define FOPEN_APPENDTEXT "at"
#elif defined(__CYGWIN__)
/* Cygwin has specific behavior we need to address when WIN32 is not defined.
/* Cygwin has specific behavior we need to address when _WIN32 is not defined.
https://cygwin.com/cygwin-ug-net/using-textbinary.html
For write we want our output to have line endings of LF and be compatible with
other Cygwin utilities. For read we want to handle input that may have line

2
lib/doh.h
View File

@ -116,7 +116,7 @@ struct dohaddr {
#define HTTPS_RR_CODE_IPV6 0x06
/*
* These may need escaping when found within an alpn string
* These may need escaping when found within an ALPN string
* value.
*/
#define COMMA_CHAR ','

2
lib/file.c
View File

@ -223,7 +223,7 @@ static CURLcode file_connect(struct Curl_easy *data, bool *done)
* A leading slash in an AmigaDOS path denotes the parent
* directory, and hence we block this as it is relative.
* Absolute paths start with 'volumename:', so we check for
* this first. Failing that, we treat the path as a real unix
* this first. Failing that, we treat the path as a real Unix
* path, but only if the application was compiled with -lunix.
*/
fd = -1;

2
lib/hostip.c
View File

@ -960,7 +960,7 @@ enum resolve_t Curl_resolv_timeout(struct Curl_easy *data,
keep_copysig = TRUE; /* yes, we have a copy */
sigact.sa_handler = alarmfunc;
#ifdef SA_RESTART
/* HPUX does not have SA_RESTART but defaults to that behavior! */
/* HP-UX does not have SA_RESTART but defaults to that behavior! */
sigact.sa_flags &= ~SA_RESTART;
#endif
/* now set the new struct */

2
lib/hostip.h
View File

@ -103,7 +103,7 @@ struct Curl_dns_entry {
size_t refcount;
/* hostname port number that resolved to addr. */
int hostport;
/* hostname that resolved to addr. may be NULL (unix domain sockets). */
/* hostname that resolved to addr. may be NULL (Unix domain sockets). */
char hostname[1];
};

4
lib/hostip4.c
View File

@ -82,7 +82,7 @@ bool Curl_ipvalid(struct Curl_easy *data, struct connectdata *conn)
* detect which one this platform supports in the configure script and set up
* the HAVE_GETHOSTBYNAME_R_3, HAVE_GETHOSTBYNAME_R_5 or
* HAVE_GETHOSTBYNAME_R_6 defines accordingly. Note that HAVE_GETADDRBYNAME
* has the corresponding rules. This is primarily on *nix. Note that some unix
* has the corresponding rules. This is primarily on *nix. Note that some Unix
* flavours have thread-safe versions of the plain gethostbyname() etc.
*
*/
@ -221,7 +221,7 @@ struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
if(!h) /* failure */
#elif defined(HAVE_GETHOSTBYNAME_R_3)
/* AIX, Digital Unix/Tru64, HPUX 10, more? */
/* AIX, Digital UNIX/Tru64, HP-UX 10, more? */
/* For AIX 4.3 or later, we do not use gethostbyname_r() at all, because of
* the plain fact that it does not return unique full buffers on each

2
lib/hostip6.c
View File

@ -124,7 +124,7 @@ struct Curl_addrinfo *Curl_getaddrinfo(struct Curl_easy *data,
#ifndef USE_RESOLVE_ON_IPS
/*
* The AI_NUMERICHOST must not be set to get synthesized IPv6 address from
* an IPv4 address on iOS and Mac OS X.
* an IPv4 address on iOS and macOS.
*/
if((1 == Curl_inet_pton(AF_INET, hostname, addrbuf)) ||
(1 == Curl_inet_pton(AF_INET6, hostname, addrbuf))) {

2
lib/http_ntlm.c
View File

@ -123,7 +123,7 @@ CURLcode Curl_input_ntlm(struct Curl_easy *data,
}
/*
* This is for creating ntlm header output
* This is for creating NTLM header output
*/
CURLcode Curl_output_ntlm(struct Curl_easy *data, bool proxy)
{

4
lib/http_ntlm.h
View File

@ -28,11 +28,11 @@
#if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM)
/* this is for ntlm header input */
/* this is for NTLM header input */
CURLcode Curl_input_ntlm(struct Curl_easy *data, bool proxy,
const char *header);
/* this is for creating ntlm header output */
/* this is for creating NTLM header output */
CURLcode Curl_output_ntlm(struct Curl_easy *data, bool proxy);
void Curl_http_auth_cleanup_ntlm(struct connectdata *conn);

4
lib/inet_ntop.c
View File

@ -185,8 +185,8 @@ static char *inet_ntop6(const unsigned char *src, char *dst, size_t size)
* Returns NULL on error and errno set with the specific
* error, EAFNOSUPPORT or ENOSPC.
*
* On Windows we store the error in the thread errno, not in the winsock error
* code. This is to avoid losing the actual last winsock error. When this
* On Windows we store the error in the thread errno, not in the Winsock error
* code. This is to avoid losing the actual last Winsock error. When this
* function returns NULL, check errno not SOCKERRNO.
*/
char *Curl_inet_ntop(int af, const void *src, char *buf, size_t size)

4
lib/inet_pton.c
View File

@ -65,8 +65,8 @@ static int inet_pton6(const char *src, unsigned char *dst);
* -1 if some other error occurred (`dst' is untouched in this case, too)
* notice:
* On Windows we store the error in the thread errno, not
* in the winsock error code. This is to avoid losing the
* actual last winsock error. When this function returns
* in the Winsock error code. This is to avoid losing the
* actual last Winsock error. When this function returns
* -1, check errno not SOCKERRNO.
* author:
* Paul Vixie, 1996.

2
lib/ldap.c
View File

@ -143,7 +143,7 @@ static void _ldap_free_urldesc(LDAPURLDesc *ludp);
#endif
#if defined(USE_WIN32_LDAP) && defined(ldap_err2string)
/* Use ansi error strings in UNICODE builds */
/* Use ANSI error strings in Unicode builds */
#undef ldap_err2string
#define ldap_err2string ldap_err2stringA
#endif

4
lib/multi.c
View File

@ -1416,7 +1416,7 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
#endif
int pollrc;
#ifdef USE_WINSOCK
if(cpfds.n) /* just pre-check with WinSock */
if(cpfds.n) /* just pre-check with Winsock */
pollrc = Curl_poll(cpfds.pfds, cpfds.n, 0);
else
pollrc = 0;
@ -1436,7 +1436,7 @@ static CURLMcode multi_wait(struct Curl_multi *multi,
WSAWaitForMultipleEvents(1, &multi->wsa_event, FALSE, (DWORD)timeout_ms,
FALSE);
}
/* With WinSock, we have to run the following section unconditionally
/* With Winsock, we have to run the following section unconditionally
to call WSAEventSelect(fd, event, 0) on all the sockets */
{
#endif

4
lib/multihandle.h
View File

@ -155,9 +155,9 @@ struct Curl_multi {
curl_multi_timer_callback timer_cb;
void *timer_userp;
struct curltime timer_lastcall; /* the fixed time for the timeout for the
previous callback */
previous callback */
#ifdef USE_WINSOCK
WSAEVENT wsa_event; /* winsock event used for waits */
WSAEVENT wsa_event; /* Winsock event used for waits */
#else
#ifdef ENABLE_WAKEUP
curl_socket_t wakeup_pair[2]; /* eventfd()/pipe()/socketpair() used for

4
lib/nonblock.c
View File

@ -47,7 +47,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */)
{
#if defined(HAVE_FCNTL_O_NONBLOCK)
/* most recent unix versions */
/* most recent Unix versions */
int flags;
flags = sfcntl(sockfd, F_GETFL, 0);
if(flags < 0)
@ -65,7 +65,7 @@ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */
#elif defined(HAVE_IOCTL_FIONBIO)
/* older unix versions */
/* older Unix versions */
int flags = nonblock ? 1 : 0;
return ioctl(sockfd, FIONBIO, &flags);

14
lib/select.c
View File

@ -56,7 +56,7 @@
* Internal function used for waiting a specific amount of ms
* in Curl_socket_check() and Curl_poll() when no file descriptor
* is provided to wait on, just being used to delay execution.
* WinSock select() and poll() timeout mechanisms need a valid
* Winsock select() and poll() timeout mechanisms need a valid
* socket descriptor in a not null file descriptor set to work.
* Waiting indefinitely with this function is not allowed, a
* zero or negative timeout value will return immediately.
@ -135,7 +135,7 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */
struct timeval *ptimeout;
#ifdef USE_WINSOCK
/* WinSock select() cannot handle zero events. See the comment below. */
/* Winsock select() cannot handle zero events. See the comment below. */
if((!fds_read || fds_read->fd_count == 0) &&
(!fds_write || fds_write->fd_count == 0) &&
(!fds_err || fds_err->fd_count == 0)) {
@ -147,7 +147,7 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */
ptimeout = curlx_mstotv(&pending_tv, timeout_ms);
#ifdef USE_WINSOCK
/* WinSock select() must not be called with an fd_set that contains zero
/* Winsock select() must not be called with an fd_set that contains zero
fd flags, or it will return WSAEINVAL. But, it also cannot be called
with no fd_sets at all! From the documentation:
@ -155,8 +155,8 @@ static int our_select(curl_socket_t maxfd, /* highest socket number */
given as null. At least one must be non-null, and any non-null
descriptor set must contain at least one handle to a socket.
It is unclear why WinSock does not just handle this for us instead of
calling this an error. Luckily, with WinSock, we can _also_ ask how
It is unclear why Winsock does not just handle this for us instead of
calling this an error. Luckily, with Winsock, we can _also_ ask how
many bits are set on an fd_set. So, let's just check it beforehand.
*/
return select((int)maxfd + 1,
@ -361,8 +361,8 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
}
/*
Note also that WinSock ignores the first argument, so we do not worry
about the fact that maxfd is computed incorrectly with WinSock (since
Note also that Winsock ignores the first argument, so we do not worry
about the fact that maxfd is computed incorrectly with Winsock (since
curl_socket_t is unsigned in such cases and thus -1 is the largest
value).
*/

4
lib/setopt.c
View File

@ -2165,7 +2165,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
*/
#ifdef USE_SSL
if(Curl_ssl_supports(data, SSLSUPP_CA_PATH))
/* This does not work on windows. */
/* This does not work on Windows. */
result = Curl_setstropt(&data->set.str[STRING_SSL_CAPATH],
va_arg(param, char *));
else
@ -2180,7 +2180,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
*/
#ifdef USE_SSL
if(Curl_ssl_supports(data, SSLSUPP_CA_PATH))
/* This does not work on windows. */
/* This does not work on Windows. */
result = Curl_setstropt(&data->set.str[STRING_SSL_CAPATH_PROXY],
va_arg(param, char *));
else

6
lib/setup-win32.h
View File

@ -62,11 +62,11 @@
#endif
/*
* Include header files for windows builds before redefining anything.
* Include header files for Windows builds before redefining anything.
* Use this preprocessor block only to include or exclude windows.h,
* winsock2.h or ws2tcpip.h. Any other windows thing belongs
* winsock2.h or ws2tcpip.h. Any other Windows thing belongs
* to any other further and independent block. Under Cygwin things work
* just as under linux (e.g. <sys/socket.h>) and the winsock headers should
* just as under Linux (e.g. <sys/socket.h>) and the Winsock headers should
* never be included when __CYGWIN__ is defined.
*/

2
lib/smb.c
View File

@ -924,7 +924,7 @@ static CURLcode smb_connection_state(struct Curl_easy *data, bool *done)
/*
* Convert a timestamp from the Windows world (100 nsec units from 1 Jan 1601)
* to Posix time. Cap the output to fit within a time_t.
* to POSIX time. Cap the output to fit within a time_t.
*/
static void get_posix_time(time_t *out, curl_off_t timestamp)
{

2
lib/socketpair.h
View File

@ -74,7 +74,7 @@ int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
#elif !defined(HAVE_SOCKETPAIR)
#define SOCKETPAIR_FAMILY 0 /* not used */
#else
#error "unsupported unix domain and socketpair build combo"
#error "unsupported Unix domain and socketpair build combo"
#endif
#ifdef SOCK_CLOEXEC

4
lib/system_win32.c
View File

@ -49,14 +49,14 @@ FREEADDRINFOEXW_FN Curl_FreeAddrInfoExW = NULL;
GETADDRINFOEXCANCEL_FN Curl_GetAddrInfoExCancel = NULL;
GETADDRINFOEXW_FN Curl_GetAddrInfoExW = NULL;
/* Curl_win32_init() performs win32 global initialization */
/* Curl_win32_init() performs Win32 global initialization */
CURLcode Curl_win32_init(long flags)
{
#ifdef USE_WINSOCK
HMODULE ws2_32Dll;
#endif
/* CURL_GLOBAL_WIN32 controls the *optional* part of the initialization which
is just for Winsock at the moment. Any required win32 initialization
is just for Winsock at the moment. Any required Win32 initialization
should take place after this block. */
if(flags & CURL_GLOBAL_WIN32) {
#ifdef USE_WINSOCK

4
lib/telnet.c
View File

@ -1342,7 +1342,7 @@ static CURLcode telnet_do(struct Curl_easy *data, bool *done)
#ifdef USE_WINSOCK
/* We want to wait for both stdin and the socket. Since
** the select() function in winsock only works on sockets
** the select() function in Winsock only works on sockets
** we have to use the WaitForMultipleObjects() call.
*/
@ -1353,7 +1353,7 @@ static CURLcode telnet_do(struct Curl_easy *data, bool *done)
return CURLE_FAILED_INIT;
}
/* Tell winsock what events we want to listen to */
/* Tell Winsock what events we want to listen to */
if(WSAEventSelect(sockfd, event_handle, FD_READ|FD_CLOSE) == SOCKET_ERROR) {
WSACloseEvent(event_handle);
return CURLE_OK;

2
lib/timeval.c
View File

@ -137,7 +137,7 @@ struct curltime Curl_now(void)
struct curltime Curl_now(void)
{
/*
** Monotonic timer on Mac OS is provided by mach_absolute_time(), which
** Monotonic timer on macOS is provided by mach_absolute_time(), which
** returns time in Mach "absolute time units," which are platform-dependent.
** To convert to nanoseconds, one must use conversion factors specified by
** mach_timebase_info().

6
lib/url.c
View File

@ -2339,7 +2339,7 @@ static CURLcode parse_proxy_auth(struct Curl_easy *data,
return result;
}
/* create_conn helper to parse and init proxy values. to be called after unix
/* create_conn helper to parse and init proxy values. to be called after Unix
socket init but before any proxy vars are evaluated. */
static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
struct connectdata *conn)
@ -2406,7 +2406,7 @@ static CURLcode create_conn_helper_init_proxy(struct Curl_easy *data,
Curl_safefree(no_proxy);
#ifdef USE_UNIX_SOCKETS
/* For the time being do not mix proxy and unix domain sockets. See #1274 */
/* For the time being do not mix proxy and Unix domain sockets. See #1274 */
if(proxy && conn->unix_domain_socket) {
free(proxy);
proxy = NULL;
@ -3338,7 +3338,7 @@ static CURLcode create_conn(struct Curl_easy *data,
}
#endif
/* After the unix socket init but before the proxy vars are used, parse and
/* After the Unix socket init but before the proxy vars are used, parse and
initialize the proxy vars */
#ifndef CURL_DISABLE_PROXY
result = create_conn_helper_init_proxy(data, conn);

6
lib/urlapi.c
View File

@ -41,13 +41,13 @@
#include "curl_memory.h"
#include "memdebug.h"
/* MSDOS/Windows style drive prefix, eg c: in c:foo */
/* MS-DOS/Windows style drive prefix, eg c: in c:foo */
#define STARTS_WITH_DRIVE_PREFIX(str) \
((('a' <= str[0] && str[0] <= 'z') || \
('A' <= str[0] && str[0] <= 'Z')) && \
(str[1] == ':'))
/* MSDOS/Windows style drive prefix, optionally with
/* MS-DOS/Windows style drive prefix, optionally with
* a '|' instead of ':', followed by a slash or NUL */
#define STARTS_WITH_URL_DRIVE_PREFIX(str) \
((('a' <= (str)[0] && (str)[0] <= 'z') || \
@ -1121,7 +1121,7 @@ static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags)
* This catches both "file:/c:" and "file:c:" */
if(('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) ||
STARTS_WITH_URL_DRIVE_PREFIX(path)) {
/* File drive letters are only accepted in MSDOS/Windows */
/* File drive letters are only accepted in MS-DOS/Windows */
result = CURLUE_BAD_FILE_URL;
goto fail;
}

8
lib/urldata.h
View File

@ -277,7 +277,7 @@ struct ssl_peer {
};
struct ssl_primary_config {
char *CApath; /* certificate dir (does not work on windows) */
char *CApath; /* certificate dir (does not work on Windows) */
char *CAfile; /* certificate to verify peer against */
char *issuercert; /* optional issuer certificate filename */
char *clientcert;
@ -442,7 +442,7 @@ struct ntlmdata {
unsigned int flags;
unsigned char nonce[8];
unsigned int target_info_len;
void *target_info; /* TargetInfo received in the ntlm type-2 message */
void *target_info; /* TargetInfo received in the NTLM type-2 message */
#endif
};
#endif
@ -1422,7 +1422,7 @@ enum dupstring {
STRING_KEY, /* private key filename */
STRING_KEY_PASSWD, /* plain text private key password */
STRING_KEY_TYPE, /* format for private key (default: PEM) */
STRING_SSL_CAPATH, /* CA directory name (does not work on windows) */
STRING_SSL_CAPATH, /* CA directory name (does not work on Windows) */
STRING_SSL_CAFILE, /* certificate file to verify peer against */
STRING_SSL_PINNEDPUBLICKEY, /* public key file to verify peer against */
STRING_SSL_CIPHER_LIST, /* list of ciphers to use */
@ -1436,7 +1436,7 @@ enum dupstring {
STRING_KEY_PROXY, /* private key filename */
STRING_KEY_PASSWD_PROXY, /* plain text private key password */
STRING_KEY_TYPE_PROXY, /* format for private key (default: PEM) */
STRING_SSL_CAPATH_PROXY, /* CA directory name (does not work on windows) */
STRING_SSL_CAPATH_PROXY, /* CA directory name (does not work on Windows) */
STRING_SSL_CAFILE_PROXY, /* certificate file to verify peer against */
STRING_SSL_PINNEDPUBLICKEY_PROXY, /* public key file to verify proxy */
STRING_SSL_CIPHER_LIST_PROXY, /* list of ciphers to use */

2
lib/version_win32.c
View File

@ -55,7 +55,7 @@ struct OUR_OSVERSIONINFOEXW {
/*
* curlx_verify_windows_version()
*
* This is used to verify if we are running on a specific windows version.
* This is used to verify if we are running on a specific Windows version.
*
* Parameters:
*

2
lib/version_win32.h
View File

@ -44,7 +44,7 @@ typedef enum {
PLATFORM_WINNT
} PlatformIdentifier;
/* This is used to verify if we are running on a specific windows version */
/* This is used to verify if we are running on a specific Windows version */
bool curlx_verify_windows_version(const unsigned int majorVersion,
const unsigned int minorVersion,
const unsigned int buildVersion,

4
lib/vquic/vquic.c
View File

@ -22,7 +22,7 @@
*
***************************************************************************/
/* WIP, experimental: use recvmmsg() on linux
/* WIP, experimental: use recvmmsg() on Linux
* we have no configure check, yet
* and also it is only available for _GNU_SOURCE, which
* we do not use otherwise.
@ -720,7 +720,7 @@ CURLcode Curl_conn_may_http3(struct Curl_easy *data,
const struct connectdata *conn)
{
if(conn->transport == TRNSPRT_UNIX) {
/* cannot do QUIC over a unix domain socket */
/* cannot do QUIC over a Unix domain socket */
return CURLE_QUIC_CONNECT_ERROR;
}
if(!(conn->handler->flags & PROTOPT_SSL)) {

2
lib/vssh/libssh2.c
View File

@ -1786,7 +1786,7 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
}
#if SIZEOF_TIME_T > SIZEOF_LONG
if(date > 0xffffffff) {
/* if 'long' cannot old >32bit, this date cannot be sent */
/* if 'long' cannot old >32-bit, this date cannot be sent */
failf(data, "date overflow");
fail = TRUE;
}

6
lib/vtls/schannel.c
View File

@ -1083,7 +1083,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
#ifdef HAS_ALPN
/* ALPN is only supported on Windows 8.1 / Server 2012 R2 and above.
Also it does not seem to be supported for Wine, see curl bug #983. */
Also it does not seem to be supported for WINE, see curl bug #983. */
backend->use_alpn = connssl->alpn &&
!GetProcAddress(GetModuleHandle(TEXT("ntdll")),
"wine_get_version") &&
@ -1099,7 +1099,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
* do it following a more manual process. */
backend->use_manual_cred_validation = true;
#else
#error "compiler too old to support requisite manual cert verify for Win CE"
#error "compiler too old to support Windows CE requisite manual cert verify"
#endif
#else
#ifdef HAS_MANUAL_VERIFY_API
@ -1242,7 +1242,7 @@ schannel_connect_step1(struct Curl_cfilter *cf, struct Curl_easy *data)
https://msdn.microsoft.com/en-us/library/windows/desktop/aa375924.aspx
At the moment we do not pass inbuf unless we are using ALPN since we only
use it for that, and Wine (for which we currently disable ALPN) is giving
use it for that, and WINE (for which we currently disable ALPN) is giving
us problems with inbuf regardless. https://github.com/curl/curl/issues/983
*/
sspi_status = s_pSecFn->InitializeSecurityContext(

2
lib/vtls/schannel_verify.c
View File

@ -83,7 +83,7 @@ static int is_cr_or_lf(char c)
/* Search the substring needle,needlelen into string haystack,haystacklen
* Strings do not need to be terminated by a '\0'.
* Similar of OSX/Linux memmem (not available on Visual Studio).
* Similar of macOS/Linux memmem (not available on Visual Studio).
* Return position of beginning of first occurrence or NULL if not found
*/
static const char *c_memmem(const void *haystack, size_t haystacklen,

6
lib/vtls/sectransp.c
View File

@ -216,7 +216,7 @@ static const uint16_t default_ciphers[] = {
#define SECTRANSP_PINNEDPUBKEY_V1 1
#endif
/* version 2 supports MacOSX 10.7+ */
/* version 2 supports macOS 10.7+ */
#if (!TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
#define SECTRANSP_PINNEDPUBKEY_V2 1
#endif
@ -592,7 +592,7 @@ static OSStatus CopyIdentityFromPKCS12File(const char *cPath,
cPassword, kCFStringEncodingUTF8) : NULL;
CFDataRef pkcs_data = NULL;
/* We can import P12 files on iOS or OS X 10.7 or later: */
/* We can import P12 files on iOS or macOS 10.7 or later: */
/* These constants are documented as having first appeared in 10.6 but they
raise linker errors when used on that cat for some reason. */
#if CURL_BUILD_MAC_10_7 || CURL_BUILD_IOS
@ -928,7 +928,7 @@ static SSLCipherSuite * sectransp_get_supported_ciphers(SSLContextRef ssl_ctx,
/* There is a known bug in early versions of Mountain Lion where ST's ECC
ciphers (cipher suite 0xC001 through 0xC032) simply do not work.
Work around the problem here by disabling those ciphers if we are
running in an affected version of OS X. */
running in an affected version of macOS. */
if(maj == 12 && min <= 3) {
size_t i = 0, j = 0;
for(; i < *len; i++) {

8
m4/curl-compilers.m4
View File

@ -569,7 +569,7 @@ AC_DEFUN([CURL_SET_COMPILER_BASIC_OPTS], [
#
INTEL_UNIX_C)
#
dnl On unix this compiler uses gcc's header files, so
dnl On Unix this compiler uses gcc's header files, so
dnl we select ANSI C89 dialect plus GNU extensions.
tmp_CFLAGS="$tmp_CFLAGS -std=gnu89"
dnl Change some warnings into errors
@ -853,8 +853,8 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [sometimes-uninitialized])
case $host_os in
cygwin* | mingw*)
dnl skip missing-variable-declarations warnings for cygwin and
dnl mingw because the libtool wrapper executable causes them
dnl skip missing-variable-declarations warnings for Cygwin and
dnl MinGW because the libtool wrapper executable causes them
;;
*)
CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [missing-variable-declarations])
@ -1032,7 +1032,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
#
dnl Only gcc 4.5 or later
if test "$compiler_num" -ge "405"; then
dnl Only windows targets
dnl Only Windows targets
if test "$curl_cv_native_windows" = "yes"; then
tmp_CFLAGS="$tmp_CFLAGS -Wno-pedantic-ms-format"
fi

24
m4/curl-functions.m4
View File

@ -1475,35 +1475,35 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
AC_MSG_CHECKING([if getaddrinfo is threadsafe])
case $host_os in
aix[[1234]].* | aix5.[[01]].*)
dnl aix 5.1 and older
dnl AIX 5.1 and older
tst_tsafe_getaddrinfo="no"
;;
aix*)
dnl aix 5.2 and newer
dnl AIX 5.2 and newer
tst_tsafe_getaddrinfo="yes"
;;
darwin[[12345]].*)
dnl darwin 5.0 and mac os x 10.1.X and older
dnl Darwin 5.0 and macOS 10.1.X and older
tst_tsafe_getaddrinfo="no"
;;
darwin*)
dnl darwin 6.0 and mac os x 10.2.X and newer
dnl Darwin 6.0 and macOS 10.2.X and newer
tst_tsafe_getaddrinfo="yes"
;;
freebsd[[1234]].* | freebsd5.[[1234]]*)
dnl freebsd 5.4 and older
dnl FreeBSD 5.4 and older
tst_tsafe_getaddrinfo="no"
;;
freebsd*)
dnl freebsd 5.5 and newer
dnl FreeBSD 5.5 and newer
tst_tsafe_getaddrinfo="yes"
;;
hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
dnl hpux 11.10 and older
dnl HP-UX 11.10 and older
tst_tsafe_getaddrinfo="no"
;;
hpux*)
dnl hpux 11.11 and newer
dnl HP-UX 11.11 and newer
tst_tsafe_getaddrinfo="yes"
;;
midnightbsd*)
@ -1511,19 +1511,19 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
tst_tsafe_getaddrinfo="yes"
;;
netbsd[[123]].*)
dnl netbsd 3.X and older
dnl NetBSD 3.X and older
tst_tsafe_getaddrinfo="no"
;;
netbsd*)
dnl netbsd 4.X and newer
dnl NetBSD 4.X and newer
tst_tsafe_getaddrinfo="yes"
;;
*bsd*)
dnl All other bsd's
dnl All other BSD's
tst_tsafe_getaddrinfo="no"
;;
solaris2*)
dnl solaris which have it
dnl Solaris which have it
tst_tsafe_getaddrinfo="yes"
;;
esac

2
m4/curl-openssl.m4
View File

@ -38,7 +38,7 @@ if test "x$OPT_OPENSSL" != xno; then
CLEANCPPFLAGS="$CPPFLAGS"
CLEANLIBS="$LIBS"
dnl This is for Msys/Mingw
dnl This is for MSYS/MinGW
case $host in
*-*-msys* | *-*-mingw*)
AC_MSG_CHECKING([for gdi32])

2
projects/wolfssl_options.h
View File

@ -29,7 +29,7 @@ build-wolfssl will copy to the wolfSSL include directories and will result in
maximum compatibility.
These are the configure options that were used to build wolfSSL v5.1.1 in
mingw and generate the options in this file:
MinGW and generate the options in this file:
C_EXTRA_FLAGS="\
-Wno-attributes \

2
projects/wolfssl_override.props
View File

@ -16,7 +16,7 @@ file by using the CustomAfterMicrosoftCommonTargets property.
-->
<ForcedIncludeFiles>$(SolutionDir)\wolfssl\options.h;%(ForcedIncludeFiles);</ForcedIncludeFiles>
<!--
Do not use the Unicode character set since their mingw config doesn't.
Do not use the Unicode character set since their MinGW config does not.
Do not use their IDE\WIN\user_settings.h since we have wolfssl_options.h.
-->
<UndefinePreprocessorDefinitions>_UNICODE;UNICODE;WOLFSSL_USER_SETTINGS;CYASSL_USER_SETTINGS;%(UndefinePreprocessorDefinitions);</UndefinePreprocessorDefinitions>

2
scripts/delta
View File

@ -89,7 +89,7 @@ $deletes=`git diff-tree --diff-filter=A -r --summary origin/$branch $start 2>/de
$creates=`git diff-tree --diff-filter=D -r --summary origin/$branch $start 2>/dev/null| wc -l`;
# Time since that tag
$tagged=`git for-each-ref --format="%(refname:short) | %(taggerdate:unix)" refs/tags/* | grep ^$start | cut "-d|" -f2`; # unix timestamp
$tagged=`git for-each-ref --format="%(refname:short) | %(taggerdate:unix)" refs/tags/* | grep ^$start | cut "-d|" -f2`; # Unix timestamp
$taggednice=`git for-each-ref --format="%(refname:short) | %(creatordate)" refs/tags/* | grep ^$start | cut '-d|' -f2`; # human readable time
chomp $taggednice;
$now=`date +%s`;

Some files were not shown because too many files have changed in this diff Show More