diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2024-09-14 10:18:21 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2024-09-14 10:30:50 +0300 |
commit | a63c2ac5dc364d4e90b3361cf85506ba4d28ebc0 (patch) | |
tree | 43c4a5e8ddddba04f1194e1f23a5e386c5b97abc | |
parent | 66e260367ac774d563874203b260b0ed0e04c93d (diff) | |
download | ydb-a63c2ac5dc364d4e90b3361cf85506ba4d28ebc0.tar.gz |
Update contrib/libs/nghttp2 to 1.63.0
commit_hash:03258d05cd49d56e9e4f5075f6bc0de2fe3dc059
-rw-r--r-- | contrib/libs/nghttp2/AUTHORS | 2 | ||||
-rw-r--r-- | contrib/libs/nghttp2/README.rst | 26 | ||||
-rw-r--r-- | contrib/libs/nghttp2/config-linux.h | 15 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h | 4 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h | 4 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/nghttp2_extpri.h | 2 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/nghttp2_hd.c | 9 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/nghttp2_helper.h | 2 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/nghttp2_submit.h | 2 | ||||
-rw-r--r-- | contrib/libs/nghttp2/ya.make | 4 |
10 files changed, 43 insertions, 27 deletions
diff --git a/contrib/libs/nghttp2/AUTHORS b/contrib/libs/nghttp2/AUTHORS index 2a361e1acb..5c065a7794 100644 --- a/contrib/libs/nghttp2/AUTHORS +++ b/contrib/libs/nghttp2/AUTHORS @@ -113,6 +113,7 @@ Richard Wolfert Rick Lei Ross Smith II Rudi Heitbaum +Ryan Carsten Schmidt Ryo Ota Scott Mitchell Sebastiaan Deckers @@ -129,6 +130,7 @@ Syohei YOSHIDA Tapanito Tatsuhiko Kubo Tatsuhiro Tsujikawa +Thomas Devoogdt Tobias Geerinckx-Rice Tom Harwood Tomas Krizek diff --git a/contrib/libs/nghttp2/README.rst b/contrib/libs/nghttp2/README.rst index b54e85c613..19bbf2cfe0 100644 --- a/contrib/libs/nghttp2/README.rst +++ b/contrib/libs/nghttp2/README.rst @@ -61,8 +61,8 @@ To build and run the application programs (``nghttp``, ``nghttpd``, ``nghttpx`` and ``h2load``) in the ``src`` directory, the following packages are required: -* OpenSSL >= 1.1.1; or LibreSSL >= 3.8.1; or aws-lc >= 1.19.0; or - BoringSSL +* OpenSSL >= 1.1.1; or wolfSSL >= 5.7.0; or LibreSSL >= 3.8.1; or + aws-lc >= 1.19.0; or BoringSSL * libev >= 4.11 * zlib >= 1.2.3 * libc-ares >= 1.7.5 @@ -125,9 +125,9 @@ following libraries are required: * `OpenSSL with QUIC support <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1w+quic>`_; or - LibreSSL (does not support 0RTT); or aws-lc; or + wolfSSL; or LibreSSL (does not support 0RTT); or aws-lc; or `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit - 6ab7c1482bf4cdc91c87bc512aaf68ffb18975ec) + e13f7e2ff5432205f09b4679c8a7715f1c130372) * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 1.4.0 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ >= 1.1.0 @@ -144,14 +144,14 @@ Use ``--with-libbpf`` configure option to build eBPF program. libelf-dev is needed to build libbpf. For Ubuntu 20.04, you can build libbpf from `the source code -<https://github.com/libbpf/libbpf/releases/tag/v1.3.0>`_. nghttpx -requires eBPF program for reloading its configuration and hot swapping -its executable. +<https://github.com/libbpf/libbpf/releases>`_. nghttpx requires eBPF +program for reloading its configuration and hot swapping its +executable. Compiling libnghttp2 C source code requires a C99 compiler. gcc 4.8 is known to be adequate. In order to compile the C++ source code, -C++20 compliant compiler is required. At least g++ >= 1.12 and -clang++ >= 1.15 are known to work. +C++20 compliant compiler is required. At least g++ >= 12 and +clang++ >= 15 are known to work. .. note:: @@ -341,7 +341,7 @@ Build aws-lc: .. code-block:: text - $ git clone --depth 1 -b v1.26.0 https://github.com/aws/aws-lc + $ git clone --depth 1 -b v1.34.2 https://github.com/aws/aws-lc $ cd aws-lc $ cmake -B build -DDISABLE_GO=ON --install-prefix=$PWD/opt $ make -j$(nproc) -C build @@ -352,7 +352,7 @@ Build nghttp3: .. code-block:: text - $ git clone --depth 1 -b v1.3.0 https://github.com/ngtcp2/nghttp3 + $ git clone --depth 1 -b v1.5.0 https://github.com/ngtcp2/nghttp3 $ cd nghttp3 $ git submodule update --init --depth 1 $ autoreconf -i @@ -365,7 +365,7 @@ Build ngtcp2: .. code-block:: text - $ git clone --depth 1 -b v1.5.0 https://github.com/ngtcp2/ngtcp2 + $ git clone --depth 1 -b v1.7.0 https://github.com/ngtcp2/ngtcp2 $ cd ngtcp2 $ git submodule update --init --depth 1 $ autoreconf -i @@ -381,7 +381,7 @@ from source: .. code-block:: text - $ git clone --depth 1 -b v1.3.0 https://github.com/libbpf/libbpf + $ git clone --depth 1 -b v1.4.5 https://github.com/libbpf/libbpf $ cd libbpf $ PREFIX=$PWD/build make -C src install $ cd .. diff --git a/contrib/libs/nghttp2/config-linux.h b/contrib/libs/nghttp2/config-linux.h index b4a3eea6aa..7f66e7a59d 100644 --- a/contrib/libs/nghttp2/config-linux.h +++ b/contrib/libs/nghttp2/config-linux.h @@ -86,6 +86,9 @@ /* Define to 1 if you have `libngtcp2_crypto_quictls` library. */ /* #undef HAVE_LIBNGTCP2_CRYPTO_QUICTLS */ +/* Define to 1 if you have `libngtcp2_crypto_wolfssl` library. */ +/* #undef HAVE_LIBNGTCP2_CRYPTO_WOLFSSL */ + /* Define to 1 if you have `libsystemd` library. */ /* #undef HAVE_LIBSYSTEMD */ @@ -128,6 +131,9 @@ /* Define to 1 if you have `neverbleed` library. */ /* #undef HAVE_NEVERBLEED */ +/* Define to 1 if you have the `pipe2' function. */ +#define HAVE_PIPE2 1 + /* Define to 1 if the system has the type `ptrdiff_t'. */ #define HAVE_PTRDIFF_T 1 @@ -233,6 +239,9 @@ /* Define to 1 if you have the <windows.h> header file. */ /* #undef HAVE_WINDOWS_H */ +/* Define to 1 if you have 'wolfssl' library. */ +/* #undef HAVE_WOLFSSL */ + /* Define to 1 if `fork' works. */ #define HAVE_WORKING_FORK 1 @@ -264,7 +273,7 @@ #define PACKAGE_NAME "nghttp2" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "nghttp2 1.62.1" +#define PACKAGE_STRING "nghttp2 1.63.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "nghttp2" @@ -273,7 +282,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.62.1" +#define PACKAGE_VERSION "1.63.0" /* Define to 1 if all of the C90 standard headers exist (not just the ones required in a freestanding environment). This macro is provided for @@ -372,7 +381,7 @@ /* Version number of package */ -#define VERSION "1.62.1" +#define VERSION "1.63.0" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h index 922ab784d8..31b58a8b8e 100644 --- a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h +++ b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2.h @@ -77,6 +77,10 @@ extern "C" { # endif /* !BUILDING_NGHTTP2 */ #endif /* !defined(WIN32) */ +#ifdef BUILDING_NGHTTP2 +# undef NGHTTP2_NO_SSIZE_T +#endif /* BUILDING_NGHTTP2 */ + /** * @typedef * diff --git a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h index c2f3323459..40570cfa1d 100644 --- a/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h +++ b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.62.1" +#define NGHTTP2_VERSION "1.63.0" /** * @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 0x013e01 +#define NGHTTP2_VERSION_NUM 0x013f00 #endif /* NGHTTP2VER_H */ diff --git a/contrib/libs/nghttp2/lib/nghttp2_extpri.h b/contrib/libs/nghttp2/lib/nghttp2_extpri.h index 23c6ddc0c0..db91197208 100644 --- a/contrib/libs/nghttp2/lib/nghttp2_extpri.h +++ b/contrib/libs/nghttp2/lib/nghttp2_extpri.h @@ -60,6 +60,6 @@ void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri); * nghttp2_extpri_uint8_inc extracts inc from |PRI| which is supposed to * be constructed by nghttp2_extpri_to_uint8. */ -#define nghttp2_extpri_uint8_inc(PRI) (((PRI)&NGHTTP2_EXTPRI_INC_MASK) != 0) +#define nghttp2_extpri_uint8_inc(PRI) (((PRI) & NGHTTP2_EXTPRI_INC_MASK) != 0) #endif /* NGHTTP2_EXTPRI_H */ diff --git a/contrib/libs/nghttp2/lib/nghttp2_hd.c b/contrib/libs/nghttp2/lib/nghttp2_hd.c index cab6ec8fc7..a4137ef14a 100644 --- a/contrib/libs/nghttp2/lib/nghttp2_hd.c +++ b/contrib/libs/nghttp2/lib/nghttp2_hd.c @@ -35,10 +35,11 @@ /* Make scalar initialization form of nghttp2_hd_entry */ #define MAKE_STATIC_ENT(N, V, T, H) \ { \ - {NULL, NULL, (uint8_t *)(N), sizeof((N)) - 1, -1}, \ - {NULL, NULL, (uint8_t *)(V), sizeof((V)) - 1, -1}, \ - {(uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0}, \ - T, H \ + {NULL, NULL, (uint8_t *)(N), sizeof((N)) - 1, -1}, \ + {NULL, NULL, (uint8_t *)(V), sizeof((V)) - 1, -1}, \ + {(uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0}, \ + T, \ + H, \ } /* Generated by mkstatictbl.py */ diff --git a/contrib/libs/nghttp2/lib/nghttp2_helper.h b/contrib/libs/nghttp2/lib/nghttp2_helper.h index 01b85c44ed..89b0d4f535 100644 --- a/contrib/libs/nghttp2/lib/nghttp2_helper.h +++ b/contrib/libs/nghttp2/lib/nghttp2_helper.h @@ -64,7 +64,7 @@ nghttp2_min_def(size, size_t); #define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0) #define nghttp2_struct_of(ptr, type, member) \ - ((type *)(void *)((char *)(ptr)-offsetof(type, member))) + ((type *)(void *)((char *)(ptr) - offsetof(type, member))) /* * Copies 2 byte unsigned integer |n| in host byte order to |buf| in diff --git a/contrib/libs/nghttp2/lib/nghttp2_submit.h b/contrib/libs/nghttp2/lib/nghttp2_submit.h index 96781d2a27..350ee02275 100644 --- a/contrib/libs/nghttp2/lib/nghttp2_submit.h +++ b/contrib/libs/nghttp2/lib/nghttp2_submit.h @@ -31,7 +31,7 @@ #include <nghttp2/nghttp2.h> -typedef struct nghttp2_data_provider_wrap nghttp2_data_provider_wrap; +#include "nghttp2_outbound_item.h" int nghttp2_submit_data_shared(nghttp2_session *session, uint8_t flags, int32_t stream_id, diff --git a/contrib/libs/nghttp2/ya.make b/contrib/libs/nghttp2/ya.make index 7e13e9939d..921abed2e7 100644 --- a/contrib/libs/nghttp2/ya.make +++ b/contrib/libs/nghttp2/ya.make @@ -9,9 +9,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.62.1) +VERSION(1.63.0) -ORIGINAL_SOURCE(https://github.com/nghttp2/nghttp2/archive/v1.62.1.tar.gz) +ORIGINAL_SOURCE(https://github.com/nghttp2/nghttp2/archive/v1.63.0.tar.gz) ADDINCL( GLOBAL contrib/libs/nghttp2/lib/includes |