From 8f3883036517c15ab3cee493feec6bdb6756701a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 26 May 2026 20:32:53 +0200 Subject: [PATCH] older -> lower, version -> v --- CMake/FindZstd.cmake | 2 +- CMake/Macros.cmake | 2 +- docs/DEPRECATE.md | 4 ++-- docs/SSL-PROBLEMS.md | 2 +- docs/TODO.md | 2 +- docs/cmdline-opts/http3.md | 4 ++-- lib/curl_setup.h | 2 +- lib/vtls/wolfssl.c | 2 +- m4/curl-compilers.m4 | 10 +++++----- m4/curl-openssl.m4 | 2 +- m4/xc-am-iface.m4 | 21 +++++++++------------ 11 files changed, 25 insertions(+), 28 deletions(-) diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake index 176645d97b..9916a269fc 100644 --- a/CMake/FindZstd.cmake +++ b/CMake/FindZstd.cmake @@ -54,7 +54,7 @@ if(NOT DEFINED ZSTD_INCLUDE_DIR AND endif() if(NOT _zstd_FOUND AND CURL_USE_CMAKECONFIG) find_package(zstd CONFIG QUIET) - # Skip using if older than v1.4.5 + # Skip using if lower than v1.4.5 if(zstd_CONFIG AND NOT TARGET zstd::libzstd_static AND NOT TARGET zstd::libzstd_shared) diff --git a/CMake/Macros.cmake b/CMake/Macros.cmake index f0968736b0..20fc9a791a 100644 --- a/CMake/Macros.cmake +++ b/CMake/Macros.cmake @@ -255,7 +255,7 @@ macro(curl_collect_target_link_options _target) get_target_property(_val ${_target} IMPORTED) if(_val) # LOCATION is empty for interface library targets and safe to ignore. - # Explicitly skip this query to avoid CMake v3.18 and older erroring out. + # Explicitly skip this query to avoid CMake v3.18 or lower erroring out. get_target_property(_val ${_target} TYPE) if(NOT "${_val}" STREQUAL "INTERFACE_LIBRARY") get_target_property(_val ${_target} LOCATION) diff --git a/docs/DEPRECATE.md b/docs/DEPRECATE.md index fe00189182..800adbf87c 100644 --- a/docs/DEPRECATE.md +++ b/docs/DEPRECATE.md @@ -75,10 +75,10 @@ Local crypto gets removed in October 2026. - winbuild build system (removed in 8.17.0) - Windows CE (removed in 8.18.0) - Support for Visual Studio 2008 (removed in 8.18.0) -- OpenSSL 1.1.1 and older (removed in 8.18.0) +- OpenSSL 1.1.1 and lower (removed in 8.18.0) - Support for Windows XP (removed in 8.19.0) - OpenSSL-QUIC (removed in 8.19.0) -- CMake 3.17 and older (removed in 8.20.0) +- CMake 3.17 and lower (removed in 8.20.0) - RTMP (removed in 8.20.0) - SMB (became opt-in in 8.20.0) - NTLM (became opt-in in 8.20.0) diff --git a/docs/SSL-PROBLEMS.md b/docs/SSL-PROBLEMS.md index d2e5ae3f16..61cd64a0b5 100644 --- a/docs/SSL-PROBLEMS.md +++ b/docs/SSL-PROBLEMS.md @@ -44,7 +44,7 @@ completely. Sometimes you may need to explicitly select an SSL version to use when connecting to make the connection succeed. An additional complication can be that modern SSL libraries sometimes are -built with support for older SSL and TLS versions disabled. +built with support for lower SSL and TLS versions disabled. All versions of SSL and the TLS versions before 1.2 are considered insecure and should be avoided. Use TLS 1.2 or greater. diff --git a/docs/TODO.md b/docs/TODO.md index bf9833118d..768d4fb93d 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -571,7 +571,7 @@ See [curl issue 5396](https://github.com/curl/curl/issues/5396) Certain stupid networks and middle boxes have a problem with SSL handshake packets that are within a certain size range because how that sets some bits -that previously (in older TLS version) were not set. The `clienthello` +that previously (in lower TLS version) were not set. The `clienthello` extension adds padding to avoid that size range. - https://datatracker.ietf.org/doc/html/rfc7685 diff --git a/docs/cmdline-opts/http3.md b/docs/cmdline-opts/http3.md index e4dfeef075..5ea0d8c62d 100644 --- a/docs/cmdline-opts/http3.md +++ b/docs/cmdline-opts/http3.md @@ -27,9 +27,9 @@ This option allows a user to avoid using the Alt-Svc method of upgrading to HTTP/3 when you know or suspect that the target speaks HTTP/3 on the given host and port. -When asked to use HTTP/3, curl issues a separate attempt to use older HTTP +When asked to use HTTP/3, curl issues a separate attempt to use lower HTTP versions with a slight delay, so if the HTTP/3 transfer fails or is slow, curl -still tries to proceed with an older HTTP version. The fallback performs the +still tries to proceed with a lower HTTP version. The fallback performs the regular negotiation between HTTP/1 and HTTP/2. Use --http3-only for similar functionality *without* a fallback. diff --git a/lib/curl_setup.h b/lib/curl_setup.h index c51b08b05e..41bac22a92 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -61,7 +61,7 @@ detects macOS, but fails to set the macro's old name `TARGET_OS_OSX`, then continues to set it to a default value of 0. Other parts of the SDK still rely on the old name, and with this inconsistency our builds fail due to - missing declarations. It happens when using mainline llvm older than v18. + missing declarations. It happens when using mainline llvm v17 or lower. Later versions fixed it by predefining these target macros, avoiding the faulty dynamic detection. gcc is not affected (for now) because it lacks the necessary dynamic detection features, so the SDK falls back to diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c index 5532a6e823..bc88d0153c 100644 --- a/lib/vtls/wolfssl.c +++ b/lib/vtls/wolfssl.c @@ -93,7 +93,7 @@ #else /* HAVE_WOLFSSL_BIO_SET_SHUTDOWN */ #undef USE_FULL_BIO #endif -/* wolfSSL 5.7.4 and older do not have these symbols, but only the +/* wolfSSL 5.7.4 and lower do not have these symbols, but only the * OpenSSL ones. */ #ifndef WOLFSSL_BIO_CTRL_GET_CLOSE #define WOLFSSL_BIO_CTRL_GET_CLOSE BIO_CTRL_GET_CLOSE diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index 8dd7412f16..125a545c82 100644 --- a/m4/curl-compilers.m4 +++ b/m4/curl-compilers.m4 @@ -996,8 +996,8 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ dnl Leave disabled for GCC <4.6, because they lack #pragma features to silence locally. if test "$want_warnings" = "yes" && test "$compiler_num" -ge "406"; then - dnl Do not enable -pedantic when cross-compiling with a gcc older - dnl than 3.0, to avoid warnings from third party system headers. + dnl Do not enable -pedantic when cross-compiling with gcc 2.x + dnl or lower, to avoid warnings from third party system headers. if test "$cross_compiling" != "yes" || test "$compiler_num" -ge "300"; then if test "$compiler_num" -ge "408"; then @@ -1014,7 +1014,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ dnl Only gcc 1.4 or greater if test "$compiler_num" -ge "104"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [pointer-arith write-strings]) - dnl If not cross-compiling with a gcc older than 3.0 + dnl If not cross-compiling with gcc 2.x or lower if test "$cross_compiling" != "yes" || test "$compiler_num" -ge "300"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [unused shadow]) @@ -1024,7 +1024,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ dnl Only gcc 2.7 or greater if test "$compiler_num" -ge "207"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [nested-externs]) - dnl If not cross-compiling with a gcc older than 3.0 + dnl If not cross-compiling with gcc 2.x or lower if test "$cross_compiling" != "yes" || test "$compiler_num" -ge "300"; then CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [missing-declarations]) @@ -1200,7 +1200,7 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [ if test "$compiler_num" -ge "300"; then tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" else - dnl When cross-compiling with a gcc older than 3.0, disable + dnl When cross-compiling with gcc 2.x or lower, disable dnl some warnings triggered on third party system headers. if test "$cross_compiling" = "yes"; then if test "$compiler_num" -ge "104"; then diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index e20099c0ad..f54cb0c111 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -286,7 +286,7 @@ if test "x$OPT_OPENSSL" != "xno"; then #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) return 0; #else - #error older than 3 + #error lower than v3.x #endif ]]) ],[],[ diff --git a/m4/xc-am-iface.m4 b/m4/xc-am-iface.m4 index b4924485c4..136919d5bc 100644 --- a/m4/xc-am-iface.m4 +++ b/m4/xc-am-iface.m4 @@ -28,15 +28,13 @@ dnl ------------------------------------------------- dnl Private macro. dnl dnl This macro performs embedding of automake initialization -dnl code into configure script. When automake version 1.14 or -dnl newer is used at configure script generation time, this -dnl results in 'subdir-objects' automake option being used. -dnl When using automake versions older than 1.14 this option -dnl is not used when generating configure script. +dnl code into configure script. When automake v1.14 or greater is used +dnl at configure script generation time, this results in 'subdir-objects' +dnl automake option being used. When using automake lower than v1.14 this +dnl option is not used when generating configure script. dnl -dnl Existence of automake _AM_PROG_CC_C_O m4 private macro -dnl is used to differentiate automake version 1.14 from older -dnl ones which lack this macro. +dnl Existence of automake _AM_PROG_CC_C_O m4 private macro is used +dnl to differentiate automake v1.14 from lower ones which lack this macro. m4_define([_XC_AUTOMAKE_BODY], [ @@ -64,10 +62,9 @@ dnl This macro embeds automake machinery into configure dnl script regardless of automake version used in order dnl to generate configure script. dnl -dnl When using automake version 1.14 or greater, automake -dnl initialization option 'subdir-objects' is used to -dnl generate the configure script, otherwise this option -dnl is not used. +dnl When using automake v1.14 or greater, automake initialization option +dnl 'subdir-objects' is used to generate the configure script, otherwise +dnl this option is not used. AC_DEFUN([XC_AUTOMAKE], [