diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2023-07-29 09:14:33 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2023-07-29 09:14:33 +0300 |
commit | 1b3a2857c174a0c9c6f5081aeb2da0bfee24b5d2 (patch) | |
tree | e3f0b9bc6e66820b6721d5e0535a6a27bbf9a760 /contrib/libs | |
parent | f418bb2f7a364f894fb2a338596fca56a6ee3bf1 (diff) | |
download | ydb-1b3a2857c174a0c9c6f5081aeb2da0bfee24b5d2.tar.gz |
Update contrib/libs/nghttp2 to 1.55.1
Diffstat (limited to 'contrib/libs')
-rw-r--r-- | contrib/libs/nghttp2/README.rst | 2 | ||||
-rw-r--r-- | contrib/libs/nghttp2/config.h | 6 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h | 4 | ||||
-rw-r--r-- | contrib/libs/nghttp2/lib/nghttp2_session.c | 10 | ||||
-rw-r--r-- | contrib/libs/nghttp2/ya.make | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/contrib/libs/nghttp2/README.rst b/contrib/libs/nghttp2/README.rst index b90bea6fbc..e551651e02 100644 --- a/contrib/libs/nghttp2/README.rst +++ b/contrib/libs/nghttp2/README.rst @@ -129,7 +129,7 @@ following libraries are required: * `OpenSSL with QUIC support <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1u+quic>`_; or `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit - b0341041b03ea71d8371a9692aedae263fc06ee9) + 80dcb67d4481fb1194b9669917e35580c32dc388) * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ 0.17.x * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_ 0.13.x diff --git a/contrib/libs/nghttp2/config.h b/contrib/libs/nghttp2/config.h index 05e54f6682..49b6b275a9 100644 --- a/contrib/libs/nghttp2/config.h +++ b/contrib/libs/nghttp2/config.h @@ -247,7 +247,7 @@ #define PACKAGE_NAME "nghttp2" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "nghttp2 1.55.0" +#define PACKAGE_STRING "nghttp2 1.55.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "nghttp2" @@ -256,7 +256,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.55.0" +#define PACKAGE_VERSION "1.55.1" /* The size of `int *', as computed by sizeof. */ #define SIZEOF_INT_P 8 @@ -361,7 +361,7 @@ /* Version number of package */ -#define VERSION "1.55.0" +#define VERSION "1.55.1" /* 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/nghttp2ver.h b/contrib/libs/nghttp2/lib/includes/nghttp2/nghttp2ver.h index 5dea3ffe10..fba310c788 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.55.0" +#define NGHTTP2_VERSION "1.55.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 0x013700 +#define NGHTTP2_VERSION_NUM 0x013701 #endif /* NGHTTP2VER_H */ diff --git a/contrib/libs/nghttp2/lib/nghttp2_session.c b/contrib/libs/nghttp2/lib/nghttp2_session.c index 7509ceb5c6..71858a39e0 100644 --- a/contrib/libs/nghttp2/lib/nghttp2_session.c +++ b/contrib/libs/nghttp2/lib/nghttp2_session.c @@ -3296,6 +3296,7 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session, if (rv < 0) { int32_t opened_stream_id = 0; uint32_t error_code = NGHTTP2_INTERNAL_ERROR; + int rv2 = 0; DEBUGF("send: frame preparation failed with %s\n", nghttp2_strerror(rv)); @@ -3338,19 +3339,18 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session, } if (opened_stream_id) { /* careful not to override rv */ - int rv2; rv2 = nghttp2_session_close_stream(session, opened_stream_id, error_code); - - if (nghttp2_is_fatal(rv2)) { - return rv2; - } } nghttp2_outbound_item_free(item, mem); nghttp2_mem_free(mem, item); active_outbound_item_reset(aob, mem); + if (nghttp2_is_fatal(rv2)) { + return rv2; + } + if (rv == NGHTTP2_ERR_HEADER_COMP) { /* If header compression error occurred, should terminiate connection. */ diff --git a/contrib/libs/nghttp2/ya.make b/contrib/libs/nghttp2/ya.make index 91f1a4527c..ed0ea9e602 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.55.0) +VERSION(1.55.1) -ORIGINAL_SOURCE(https://github.com/nghttp2/nghttp2/archive/v1.55.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/nghttp2/nghttp2/archive/v1.55.1.tar.gz) ADDINCL( GLOBAL contrib/libs/nghttp2/lib/includes |