From a868c522ed0ae4e0b03764d86c7848d69d1e0942 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Tue, 28 May 2024 22:28:05 +0800 Subject: [PATCH] v8.8.0 --- .../main/native/config/versions/nghttp2ver.h | 4 +- .../main/native/config/versions/nghttp3ver.h | 4 +- .../main/native/config/versions/ngtcp2ver.h | 4 +- curl/src/main/native/config32/curl_config.h | 49 +++++++++++-------- curl/src/main/native/config64/curl_config.h | 47 +++++++++++------- curl/src/main/native/curl | 2 +- curl/src/main/native/nghttp2 | 2 +- curl/src/main/native/nghttp3 | 2 +- curl/src/main/native/ngtcp2 | 2 +- 9 files changed, 67 insertions(+), 49 deletions(-) diff --git a/curl/src/main/native/config/versions/nghttp2ver.h b/curl/src/main/native/config/versions/nghttp2ver.h index 518755b..c2f3323 100644 --- a/curl/src/main/native/config/versions/nghttp2ver.h +++ b/curl/src/main/native/config/versions/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.59.0" +#define NGHTTP2_VERSION "1.62.1" /** * @macro @@ -37,6 +37,6 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define NGHTTP2_VERSION_NUM 0x013b00 +#define NGHTTP2_VERSION_NUM 0x013e01 #endif /* NGHTTP2VER_H */ diff --git a/curl/src/main/native/config/versions/nghttp3ver.h b/curl/src/main/native/config/versions/nghttp3ver.h index a71a49b..fc1e331 100644 --- a/curl/src/main/native/config/versions/nghttp3ver.h +++ b/curl/src/main/native/config/versions/nghttp3ver.h @@ -31,7 +31,7 @@ * * Version number of the nghttp3 library release. */ -#define NGHTTP3_VERSION "1.1.0" +#define NGHTTP3_VERSION "1.3.0" /** * @macro @@ -41,6 +41,6 @@ * number, 8 bits for minor and 8 bits for patch. Version 1.2.3 * becomes 0x010203. */ -#define NGHTTP3_VERSION_NUM 0x010100 +#define NGHTTP3_VERSION_NUM 0x010300 #endif /* NGHTTP3_VERSION_H */ diff --git a/curl/src/main/native/config/versions/ngtcp2ver.h b/curl/src/main/native/config/versions/ngtcp2ver.h index b102eae..9eb076d 100644 --- a/curl/src/main/native/config/versions/ngtcp2ver.h +++ b/curl/src/main/native/config/versions/ngtcp2ver.h @@ -36,7 +36,7 @@ * * Version number of the ngtcp2 library release. */ -#define NGTCP2_VERSION "1.2.0" +#define NGTCP2_VERSION "1.5.0" /** * @macro @@ -46,6 +46,6 @@ * number, 8 bits for minor and 8 bits for patch. Version 1.2.3 * becomes 0x010203. */ -#define NGTCP2_VERSION_NUM 0x010200 +#define NGTCP2_VERSION_NUM 0x010500 #endif /* VERSION_H */ diff --git a/curl/src/main/native/config32/curl_config.h b/curl/src/main/native/config32/curl_config.h index 535cead..83dd0e0 100644 --- a/curl/src/main/native/config32/curl_config.h +++ b/curl/src/main/native/config32/curl_config.h @@ -1,6 +1,9 @@ /* lib/curl_config.h. Generated from curl_config.h.in by configure. */ /* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ +/* Ignore c-ares deprecation warnings */ +/* #undef CARES_NO_DEPRECATED */ + /* to enable curl debug memory tracking */ /* #undef CURLDEBUG */ @@ -151,11 +154,8 @@ /* enable debug build options */ /* #undef DEBUGBUILD */ -/* Define if you want to enable IPv6 support */ -#define ENABLE_IPV6 1 - /* Define to the type of arg 2 for gethostname. */ -#define GETHOSTNAME_TYPE_ARG2 unsigned int +#define GETHOSTNAME_TYPE_ARG2 size_t /* Define to 1 if you have the alarm function. */ #define HAVE_ALARM 1 @@ -210,6 +210,9 @@ /* "Set if getpwuid_r() declaration is missing" */ /* #undef HAVE_DECL_GETPWUID_R_MISSING */ +/* if you have */ +#define HAVE_DIRENT_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -397,6 +400,9 @@ /* Define to 1 if you have the `idn2' library (-lidn2). */ /* #undef HAVE_LIBIDN2 */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBPSL_H */ + /* Define to 1 if using libressl. */ /* #undef HAVE_LIBRESSL */ @@ -476,6 +482,9 @@ */ /* #undef HAVE_OLD_GSSMIT */ +/* if you have opendir */ +#define HAVE_OPENDIR 1 + /* Define to 1 if using OpenSSL 3 or later. */ /* #undef HAVE_OPENSSL3 */ @@ -591,8 +600,8 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SOCKET_H */ -/* Define to 1 if you have the `SSL_get_ech_status' function. */ -/* #undef HAVE_SSL_GET_ECH_STATUS */ +/* Define to 1 if you have the `SSL_ech_set1_echconfig' function. */ +/* #undef HAVE_SSL_ECH_SET1_ECHCONFIG */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SSL_H */ @@ -600,6 +609,9 @@ /* Define to 1 if you have the `SSL_set0_wbio' function. */ #define HAVE_SSL_SET0_WBIO 1 +/* Define to 1 if you have the `SSL_set1_ech_config_list' function. */ +/* #undef HAVE_SSL_SET1_ECH_CONFIG_LIST */ + /* Define to 1 if you have the `SSL_set_quic_use_legacy_codepoint' function. */ #define HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT 1 @@ -727,6 +739,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WOLFSSH_SSH_H */ +/* Define to 1 if you have the `wolfSSL_CTX_GenerateEchConfig' function. */ +/* #undef HAVE_WOLFSSL_CTX_GENERATEECHCONFIG */ + /* if you have wolfSSL_DES_ecb_encrypt */ /* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */ @@ -766,12 +781,6 @@ /* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */ /* #undef NEED_THREAD_SAFE */ -/* Define to enable NTLM delegation to winbind's ntlm_auth helper. */ -/* #undef NTLM_WB_ENABLED */ - -/* Define absolute filename for winbind's ntlm_auth helper. */ -/* #undef NTLM_WB_FILE */ - /* cpu-machine-OS */ #define OS "unknown-linux-android" @@ -838,7 +847,7 @@ /* #undef USE_BEARSSL */ /* if ECH support is available */ -/* #undef USE_ECH */ +#define USE_ECH 1 /* if GnuTLS is enabled */ /* #undef USE_GNUTLS */ @@ -846,10 +855,16 @@ /* GSASL support enabled */ /* #undef USE_GSASL */ +/* force HTTPS RR support for ECH */ +#define USE_HTTPSRR 1 + /* if hyper is in use */ /* #undef USE_HYPER */ -/* PSL support enabled */ +/* Define if you want to enable IPv6 support */ +#define USE_IPV6 1 + +/* if libpsl is in use */ /* #undef USE_LIBPSL */ /* if librtmp is in use */ @@ -980,12 +995,6 @@ /* Type to use in place of in_addr_t when system does not provide it. */ /* #undef in_addr_t */ -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - /* Define to `unsigned int' if does not define. */ /* #undef size_t */ diff --git a/curl/src/main/native/config64/curl_config.h b/curl/src/main/native/config64/curl_config.h index 8ac324d..72a9b3a 100644 --- a/curl/src/main/native/config64/curl_config.h +++ b/curl/src/main/native/config64/curl_config.h @@ -1,6 +1,9 @@ /* lib/curl_config.h. Generated from curl_config.h.in by configure. */ /* lib/curl_config.h.in. Generated from configure.ac by autoheader. */ +/* Ignore c-ares deprecation warnings */ +/* #undef CARES_NO_DEPRECATED */ + /* to enable curl debug memory tracking */ /* #undef CURLDEBUG */ @@ -151,9 +154,6 @@ /* enable debug build options */ /* #undef DEBUGBUILD */ -/* Define if you want to enable IPv6 support */ -#define ENABLE_IPV6 1 - /* Define to the type of arg 2 for gethostname. */ #define GETHOSTNAME_TYPE_ARG2 size_t @@ -210,6 +210,9 @@ /* "Set if getpwuid_r() declaration is missing" */ /* #undef HAVE_DECL_GETPWUID_R_MISSING */ +/* if you have */ +#define HAVE_DIRENT_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -397,6 +400,9 @@ /* Define to 1 if you have the `idn2' library (-lidn2). */ /* #undef HAVE_LIBIDN2 */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBPSL_H */ + /* Define to 1 if using libressl. */ /* #undef HAVE_LIBRESSL */ @@ -476,6 +482,9 @@ */ /* #undef HAVE_OLD_GSSMIT */ +/* if you have opendir */ +#define HAVE_OPENDIR 1 + /* Define to 1 if using OpenSSL 3 or later. */ /* #undef HAVE_OPENSSL3 */ @@ -591,8 +600,8 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SOCKET_H */ -/* Define to 1 if you have the `SSL_get_ech_status' function. */ -/* #undef HAVE_SSL_GET_ECH_STATUS */ +/* Define to 1 if you have the `SSL_ech_set1_echconfig' function. */ +/* #undef HAVE_SSL_ECH_SET1_ECHCONFIG */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SSL_H */ @@ -600,6 +609,9 @@ /* Define to 1 if you have the `SSL_set0_wbio' function. */ #define HAVE_SSL_SET0_WBIO 1 +/* Define to 1 if you have the `SSL_set1_ech_config_list' function. */ +/* #undef HAVE_SSL_SET1_ECH_CONFIG_LIST */ + /* Define to 1 if you have the `SSL_set_quic_use_legacy_codepoint' function. */ #define HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT 1 @@ -727,6 +739,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WOLFSSH_SSH_H */ +/* Define to 1 if you have the `wolfSSL_CTX_GenerateEchConfig' function. */ +/* #undef HAVE_WOLFSSL_CTX_GENERATEECHCONFIG */ + /* if you have wolfSSL_DES_ecb_encrypt */ /* #undef HAVE_WOLFSSL_DES_ECB_ENCRYPT */ @@ -766,12 +781,6 @@ /* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */ /* #undef NEED_THREAD_SAFE */ -/* Define to enable NTLM delegation to winbind's ntlm_auth helper. */ -/* #undef NTLM_WB_ENABLED */ - -/* Define absolute filename for winbind's ntlm_auth helper. */ -/* #undef NTLM_WB_FILE */ - /* cpu-machine-OS */ #define OS "unknown-linux-android" @@ -838,7 +847,7 @@ /* #undef USE_BEARSSL */ /* if ECH support is available */ -/* #undef USE_ECH */ +#define USE_ECH 1 /* if GnuTLS is enabled */ /* #undef USE_GNUTLS */ @@ -846,10 +855,16 @@ /* GSASL support enabled */ /* #undef USE_GSASL */ +/* force HTTPS RR support for ECH */ +#define USE_HTTPSRR 1 + /* if hyper is in use */ /* #undef USE_HYPER */ -/* PSL support enabled */ +/* Define if you want to enable IPv6 support */ +#define USE_IPV6 1 + +/* if libpsl is in use */ /* #undef USE_LIBPSL */ /* if librtmp is in use */ @@ -980,12 +995,6 @@ /* Type to use in place of in_addr_t when system does not provide it. */ /* #undef in_addr_t */ -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - /* Define to `unsigned int' if does not define. */ /* #undef size_t */ diff --git a/curl/src/main/native/curl b/curl/src/main/native/curl index 5ce164e..fd567d4 160000 --- a/curl/src/main/native/curl +++ b/curl/src/main/native/curl @@ -1 +1 @@ -Subproject commit 5ce164e0e9290c96eb7d502173426c0a135ec008 +Subproject commit fd567d4f06857f4fc8e2f64ea727b1318f76ad33 diff --git a/curl/src/main/native/nghttp2 b/curl/src/main/native/nghttp2 index 4c250df..d13a575 160000 --- a/curl/src/main/native/nghttp2 +++ b/curl/src/main/native/nghttp2 @@ -1 +1 @@ -Subproject commit 4c250df3187e8b5bb1167cafc4a7a9dcc139eb02 +Subproject commit d13a5758373931064636c1641db6277db45552dc diff --git a/curl/src/main/native/nghttp3 b/curl/src/main/native/nghttp3 index e584190..e4f96f9 160000 --- a/curl/src/main/native/nghttp3 +++ b/curl/src/main/native/nghttp3 @@ -1 +1 @@ -Subproject commit e5841909338adeb280a78da076f85f6a14b48419 +Subproject commit e4f96f9572e4fc27324b4a009d877a4a2bbacc4e diff --git a/curl/src/main/native/ngtcp2 b/curl/src/main/native/ngtcp2 index 4bda9fb..e2372a8 160000 --- a/curl/src/main/native/ngtcp2 +++ b/curl/src/main/native/ngtcp2 @@ -1 +1 @@ -Subproject commit 4bda9fb469993e732f73270316125c7c78ca0012 +Subproject commit e2372a8256322284f5795cd765c4eccbc06bbdeb