Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update nghttp2 to 1.55.1 #48790

Merged
merged 1 commit into from
Jul 17, 2023
Merged

deps: update nghttp2 to 1.55.1 #48790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
* @macro
* Version number of the nghttp2 library release
*/
#define NGHTTP2_VERSION "1.55.0"
#define NGHTTP2_VERSION "1.55.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 0x013700
#define NGHTTP2_VERSION_NUM 0x013701

#endif /* NGHTTP2VER_H */
10 changes: 5 additions & 5 deletions deps/nghttp2/lib/nghttp2_session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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. */
Expand Down
6 changes: 3 additions & 3 deletions doc/contributing/maintaining/maintaining-dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This a list of all the dependencies:
* [libuv 1.46.0][]
* [llhttp 8.1.0][]
* [minimatch 9.0.3][]
* [nghttp2 1.55.0][]
* [nghttp2 1.55.1][]
* [nghttp3 0.7.0][]
* [ngtcp2 0.8.1][]
* [npm 9.6.7][]
Expand Down Expand Up @@ -223,7 +223,7 @@ See [maintaining-http][] for more informations.
The [minimatch](https://github.com/isaacs/minimatch) dependency is a
minimal matching utility.

### nghttp2 1.55.0
### nghttp2 1.55.1

The [nghttp2](https://github.com/nghttp2/nghttp2) dependency is a C library
implementing HTTP/2 protocol.
Expand Down Expand Up @@ -338,7 +338,7 @@ performance improvements not currently available in standard zlib.
[maintaining-openssl]: ./maintaining-openssl.md
[maintaining-web-assembly]: ./maintaining-web-assembly.md
[minimatch 9.0.3]: #minimatch-903
[nghttp2 1.55.0]: #nghttp2-1550
[nghttp2 1.55.1]: #nghttp2-1551
[nghttp3 0.7.0]: #nghttp3-070
[ngtcp2 0.8.1]: #ngtcp2-081
[npm 9.6.7]: #npm-967
Expand Down