Skip to content

Commit

Permalink
deps: update nghttp2 to 1.65.0
Browse files Browse the repository at this point in the history
  • Loading branch information
targos authored and github-actions[bot] committed Mar 2, 2025
1 parent 6b0af17 commit 6ab6abb
Show file tree
Hide file tree
Showing 11 changed files with 1,220 additions and 2,492 deletions.
241 changes: 31 additions & 210 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2.h

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
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.64.0"
#define NGHTTP2_VERSION "1.65.0"

/**
* @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 0x014000
#define NGHTTP2_VERSION_NUM 0x014100

#endif /* NGHTTP2VER_H */
11 changes: 11 additions & 0 deletions deps/nghttp2/lib/nghttp2_hd.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,19 @@ static void hd_map_remove(nghttp2_hd_map *map, nghttp2_hd_entry *ent) {
static int hd_ringbuf_init(nghttp2_hd_ringbuf *ringbuf, size_t bufsize,
nghttp2_mem *mem) {
size_t size;
const size_t max_size = SIZE_MAX / sizeof(nghttp2_hd_entry *);

if (bufsize > max_size) {
return NGHTTP2_ERR_NOMEM;
}

for (size = 1; size < bufsize; size <<= 1)
;

if (size > max_size) {
return NGHTTP2_ERR_NOMEM;
}

ringbuf->buffer = nghttp2_mem_malloc(mem, sizeof(nghttp2_hd_entry *) * size);
if (ringbuf->buffer == NULL) {
return NGHTTP2_ERR_NOMEM;
Expand Down
17 changes: 8 additions & 9 deletions deps/nghttp2/lib/nghttp2_http.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_hd_nv *nv,
if (!trailer &&
/* Do not parse the header field in PUSH_PROMISE. */
(stream->stream_id & 1) &&
(stream->flags & NGHTTP2_STREAM_FLAG_NO_RFC7540_PRIORITIES) &&
!(stream->http_flags & NGHTTP2_HTTP_FLAG_BAD_PRIORITY)) {
nghttp2_extpri_from_uint8(&extpri, stream->http_extpri);
if (nghttp2_http_parse_priority(&extpri, nv->value->base,
Expand Down Expand Up @@ -660,17 +659,17 @@ void nghttp2_http_record_request_method(nghttp2_stream *stream,
int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
size_t valuelen) {
nghttp2_extpri pri = *dest;
sf_parser sfp;
sf_vec key;
sf_value val;
sfparse_parser sfp;
sfparse_vec key;
sfparse_value val;
int rv;

sf_parser_init(&sfp, value, valuelen);
sfparse_parser_init(&sfp, value, valuelen);

for (;;) {
rv = sf_parser_dict(&sfp, &key, &val);
rv = sfparse_parser_dict(&sfp, &key, &val);
if (rv != 0) {
if (rv == SF_ERR_EOF) {
if (rv == SFPARSE_ERR_EOF) {
break;
}

Expand All @@ -683,15 +682,15 @@ int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,

switch (key.base[0]) {
case 'i':
if (val.type != SF_TYPE_BOOLEAN) {
if (val.type != SFPARSE_TYPE_BOOLEAN) {
return NGHTTP2_ERR_INVALID_ARGUMENT;
}

pri.inc = val.boolean;

break;
case 'u':
if (val.type != SF_TYPE_INTEGER ||
if (val.type != SFPARSE_TYPE_INTEGER ||
val.integer < NGHTTP2_EXTPRI_URGENCY_HIGH ||
NGHTTP2_EXTPRI_URGENCY_LOW < val.integer) {
return NGHTTP2_ERR_INVALID_ARGUMENT;
Expand Down
Loading

0 comments on commit 6ab6abb

Please sign in to comment.