mirror of
https://github.com/curl/curl.git
synced 2026-06-13 09:15:39 +03:00
parent
57fd720f9d
commit
a4402ae443
6 changed files with 10 additions and 10 deletions
|
|
@ -562,7 +562,7 @@ We recommend using CMake to build curl with MSVC.
|
|||
The project build files reside in project/Windows/VC\* for VS2010, VS2012 and
|
||||
VS2013.
|
||||
|
||||
These CMake Visual Studio generators require CMake v3.24 or less. You can
|
||||
These CMake Visual Studio generators require CMake v3.24 or lower. You can
|
||||
download them from <https://cmake.org/files/v3.24/>.
|
||||
|
||||
You can also use `-G "NMake Makefiles"`, which is supported by all CMake
|
||||
|
|
|
|||
|
|
@ -1896,7 +1896,7 @@ static CURLcode gtls_verifyserver(struct Curl_cfilter *cf,
|
|||
goto out;
|
||||
|
||||
#ifdef CURL_GNUTLS_EARLY_DATA
|
||||
/* Only on TLSv1.2 or less do we have the session id now. For
|
||||
/* Only on TLSv1.2 or lower do we have the session id now. For
|
||||
* TLSv1.3 we get it via a SESSION_TICKET message that arrives later. */
|
||||
if(gnutls_protocol_get_version(session) < GNUTLS_TLS1_3)
|
||||
result = cf_gtls_update_session_id(cf, data, session);
|
||||
|
|
|
|||
|
|
@ -4148,7 +4148,7 @@ static CURLcode ossl_connect_step2(struct Curl_cfilter *cf,
|
|||
|
||||
#if !defined(HAVE_KEYLOG_UPSTREAM) && !defined(HAVE_KEYLOG_CALLBACK)
|
||||
/* If key logging is enabled, wait for the handshake to complete and then
|
||||
* proceed with logging secrets (for TLS 1.2 or less).
|
||||
* proceed with logging secrets (for TLS 1.2 or lower).
|
||||
*/
|
||||
if(Curl_tls_keylog_enabled() && !octx->keylog_done)
|
||||
ossl_log_tls12_secret(octx->ssl, &octx->keylog_done);
|
||||
|
|
|
|||
|
|
@ -1729,7 +1729,7 @@ static CURLcode wssl_handshake(struct Curl_cfilter *cf, struct Curl_easy *data)
|
|||
#ifdef OPENSSL_EXTRA
|
||||
if(Curl_tls_keylog_enabled()) {
|
||||
/* If key logging is enabled, wait for the handshake to complete and then
|
||||
* proceed with logging secrets (for TLS 1.2 or less).
|
||||
* proceed with logging secrets (for TLS 1.2 or lower).
|
||||
*
|
||||
* During the handshake (ret==-1), wolfSSL_want_read() is true as it waits
|
||||
* for the server response. At that point the master secret is not yet
|
||||
|
|
|
|||
|
|
@ -1335,7 +1335,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||
fi
|
||||
case $host_os in
|
||||
aix[[1234]].* | aix5.[[01]].*)
|
||||
dnl AIX 5.1 or less
|
||||
dnl AIX 5.1 or lower
|
||||
tst_tsafe_getaddrinfo="no"
|
||||
;;
|
||||
aix*)
|
||||
|
|
@ -1343,11 +1343,11 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||
tst_tsafe_getaddrinfo="yes"
|
||||
;;
|
||||
darwin[[12345]].*)
|
||||
dnl Darwin 5.0 and macOS 10.1.x or less
|
||||
dnl Darwin 5.0 and macOS 10.1.x or lower
|
||||
tst_tsafe_getaddrinfo="no"
|
||||
;;
|
||||
freebsd[[1234]].* | freebsd5.[[1234]]*)
|
||||
dnl FreeBSD 5.4 or less
|
||||
dnl FreeBSD 5.4 or lower
|
||||
tst_tsafe_getaddrinfo="no"
|
||||
;;
|
||||
freebsd*)
|
||||
|
|
@ -1355,7 +1355,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||
tst_tsafe_getaddrinfo="yes"
|
||||
;;
|
||||
hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
|
||||
dnl HP-UX 11.10 or less
|
||||
dnl HP-UX 11.10 or lower
|
||||
tst_tsafe_getaddrinfo="no"
|
||||
;;
|
||||
hpux*)
|
||||
|
|
@ -1367,7 +1367,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
|
|||
tst_tsafe_getaddrinfo="yes"
|
||||
;;
|
||||
netbsd[[123]].*)
|
||||
dnl NetBSD 3.x or less
|
||||
dnl NetBSD 3.x or lower
|
||||
tst_tsafe_getaddrinfo="no"
|
||||
;;
|
||||
netbsd*)
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ dnl Internal macro for CURL_CONFIGURE_THREAD_SAFE.
|
|||
AC_DEFUN([CURL_CHECK_NEED_THREAD_SAFE_SYSTEM], [
|
||||
case $host_os in
|
||||
aix[[123]].* | aix4.[[012]].*)
|
||||
dnl AIX 4.2 or less
|
||||
dnl AIX 4.2 or lower
|
||||
tmp_need_thread_safe="no"
|
||||
;;
|
||||
aix*)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue