Skip to content

Commit 7e9b08d

Browse files
nodejs-github-botrichardlau
authored andcommitted
deps: update nghttp2 to 1.55.1
PR-URL: #48790 Backport-PR-URL: #50151 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
1 parent 85672c1 commit 7e9b08d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
* @macro
3030
* Version number of the nghttp2 library release
3131
*/
32-
#define NGHTTP2_VERSION "1.55.0"
32+
#define NGHTTP2_VERSION "1.55.1"
3333

3434
/**
3535
* @macro
3636
* Numerical representation of the version number of the nghttp2 library
3737
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3838
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3939
*/
40-
#define NGHTTP2_VERSION_NUM 0x013700
40+
#define NGHTTP2_VERSION_NUM 0x013701
4141

4242
#endif /* NGHTTP2VER_H */

deps/nghttp2/lib/nghttp2_session.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -3296,6 +3296,7 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
32963296
if (rv < 0) {
32973297
int32_t opened_stream_id = 0;
32983298
uint32_t error_code = NGHTTP2_INTERNAL_ERROR;
3299+
int rv2 = 0;
32993300

33003301
DEBUGF("send: frame preparation failed with %s\n",
33013302
nghttp2_strerror(rv));
@@ -3338,19 +3339,18 @@ static ssize_t nghttp2_session_mem_send_internal(nghttp2_session *session,
33383339
}
33393340
if (opened_stream_id) {
33403341
/* careful not to override rv */
3341-
int rv2;
33423342
rv2 = nghttp2_session_close_stream(session, opened_stream_id,
33433343
error_code);
3344-
3345-
if (nghttp2_is_fatal(rv2)) {
3346-
return rv2;
3347-
}
33483344
}
33493345

33503346
nghttp2_outbound_item_free(item, mem);
33513347
nghttp2_mem_free(mem, item);
33523348
active_outbound_item_reset(aob, mem);
33533349

3350+
if (nghttp2_is_fatal(rv2)) {
3351+
return rv2;
3352+
}
3353+
33543354
if (rv == NGHTTP2_ERR_HEADER_COMP) {
33553355
/* If header compression error occurred, should terminiate
33563356
connection. */

0 commit comments

Comments
 (0)