v8.8.0

vvb2060 · May 28, 2024 · a868c52 · a868c52
1 parent a3c62d9
commit a868c52
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 49 deletions.
diff --git a/curl/src/main/native/config/versions/nghttp2ver.h b/curl/src/main/native/config/versions/nghttp2ver.h
@@ -29,14 +29,14 @@
  * @macro
  * Version number of the nghttp2 library release
  */
-#define NGHTTP2_VERSION "1.59.0"
+#define NGHTTP2_VERSION "1.62.1"
 
 /**
  * @macro
  * Numerical representation of the version number of the nghttp2 library
  * 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
@@ -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
@@ -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
@@ -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 <dirent.h> */
+#define HAVE_DIRENT_H 1
+
 /* Define to 1 if you have the <dlfcn.h> 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 <libpsl.h> 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,15 +600,18 @@
 /* Define to 1 if you have the <socket.h> 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 <ssl.h> header file. */
 /* #undef HAVE_SSL_H */
 
 /* 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 <wolfssh/ssh.h> 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,18 +847,24 @@
 /* #undef USE_BEARSSL */
 
 /* if ECH support is available */
-/* #undef USE_ECH */
+#define USE_ECH 1
 
 /* if GnuTLS is enabled */
 /* #undef USE_GNUTLS */
 
 /* 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 <sys/types.h> 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
@@ -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 <dirent.h> */
+#define HAVE_DIRENT_H 1
+
 /* Define to 1 if you have the <dlfcn.h> 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 <libpsl.h> 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,15 +600,18 @@
 /* Define to 1 if you have the <socket.h> 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 <ssl.h> header file. */
 /* #undef HAVE_SSL_H */
 
 /* 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 <wolfssh/ssh.h> 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,18 +847,24 @@
 /* #undef USE_BEARSSL */
 
 /* if ECH support is available */
-/* #undef USE_ECH */
+#define USE_ECH 1
 
 /* if GnuTLS is enabled */
 /* #undef USE_GNUTLS */
 
 /* 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 <sys/types.h> does not define. */
 /* #undef size_t */
 

diff --git a/curl/src/main/native/curl b/curl/src/main/native/curl
diff --git a/curl/src/main/native/nghttp2 b/curl/src/main/native/nghttp2
diff --git a/curl/src/main/native/nghttp3 b/curl/src/main/native/nghttp3
diff --git a/curl/src/main/native/ngtcp2 b/curl/src/main/native/ngtcp2
+86 −15		.github/workflows/build.yml
+7 −0		.github/workflows/cflite_batch.yaml
+20 −0		.github/workflows/stale.yaml
+1 −0		.gitignore
+6 −0		.gitmodules
+2 −0		AUTHORS
+39 −11		CMakeLists.txt
+1 −0		CMakeOptions.txt
+0 −1		Makefile.am
+12 −0		README.rst
+0 −40		cmake/FindCUnit.cmake
+5 −49		configure.ac
+1 −1		doc/source/qpack-howto.rst
+1 −1		examples/CMakeLists.txt
+1 −1		examples/qpack.cc
+7 −9		lib/CMakeLists.txt
+3 −3		lib/Makefile.am
+43 −10		lib/includes/nghttp3/nghttp3.h
+16 −1		lib/nghttp3_conn.c
+1 −1		lib/nghttp3_http.c
+16 −0		lib/nghttp3_qpack.c
+18 −4		lib/nghttp3_qpack.h
+3 −1		lib/nghttp3_qpack_huffman.c
+14 −15		lib/nghttp3_stream.c
+14 −11		lib/nghttp3_stream.h
+1 −0		lib/sfparse
+0 −1,146		lib/sfparse.c
+0 −409		lib/sfparse.h
+6 −4		makerelease.sh
+26 −29		tests/CMakeLists.txt
+9 −10		tests/Makefile.am
+15 −108		tests/main.c
+1 −0		tests/munit
+561 −364		tests/nghttp3_conn_test.c
+33 −26		tests/nghttp3_conn_test.h
+0 −2		tests/nghttp3_conv_test.c
+64 −57		tests/nghttp3_http_test.c
+8 −2		tests/nghttp3_http_test.h
+348 −196		tests/nghttp3_qpack_test.c
+17 −9		tests/nghttp3_qpack_test.h
+29 −22		tests/nghttp3_tnode_test.c
+7 −1		tests/nghttp3_tnode_test.h