mirror of
https://github.com/nodejs/node.git
synced 2024-11-21 10:59:27 +00:00
deps: update nghttp2 to 1.58.0
PR-URL: https://github.com/nodejs/node/pull/50441 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
parent
401ea75bdd
commit
9e30518107
@ -29,7 +29,7 @@
|
||||
* @macro
|
||||
* Version number of the nghttp2 library release
|
||||
*/
|
||||
#define NGHTTP2_VERSION "1.57.0"
|
||||
#define NGHTTP2_VERSION "1.58.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 0x013900
|
||||
#define NGHTTP2_VERSION_NUM 0x013a00
|
||||
|
||||
#endif /* NGHTTP2VER_H */
|
||||
|
2
deps/nghttp2/lib/nghttp2_map.c
vendored
2
deps/nghttp2/lib/nghttp2_map.c
vendored
@ -126,6 +126,7 @@ static void map_bucket_set_data(nghttp2_map_bucket *bkt, uint32_t hash,
|
||||
bkt->data = data;
|
||||
}
|
||||
|
||||
#ifndef WIN32
|
||||
void nghttp2_map_print_distance(nghttp2_map *map) {
|
||||
uint32_t i;
|
||||
size_t idx;
|
||||
@ -145,6 +146,7 @@ void nghttp2_map_print_distance(nghttp2_map *map) {
|
||||
distance(map->tablelen, map->tablelenbits, bkt, idx));
|
||||
}
|
||||
}
|
||||
#endif /* !WIN32 */
|
||||
|
||||
static int insert(nghttp2_map_bucket *table, uint32_t tablelen,
|
||||
uint32_t tablelenbits, uint32_t hash,
|
||||
|
2
deps/nghttp2/lib/nghttp2_map.h
vendored
2
deps/nghttp2/lib/nghttp2_map.h
vendored
@ -131,6 +131,8 @@ size_t nghttp2_map_size(nghttp2_map *map);
|
||||
int nghttp2_map_each(nghttp2_map *map, int (*func)(void *data, void *ptr),
|
||||
void *ptr);
|
||||
|
||||
#ifndef WIN32
|
||||
void nghttp2_map_print_distance(nghttp2_map *map);
|
||||
#endif /* !WIN32 */
|
||||
|
||||
#endif /* NGHTTP2_MAP_H */
|
||||
|
14
deps/nghttp2/lib/nghttp2_time.c
vendored
14
deps/nghttp2/lib/nghttp2_time.c
vendored
@ -32,7 +32,7 @@
|
||||
# include <sysinfoapi.h>
|
||||
#endif /* HAVE_SYSINFOAPI_H */
|
||||
|
||||
#ifndef HAVE_GETTICKCOUNT64
|
||||
#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
|
||||
static uint64_t time_now_sec(void) {
|
||||
time_t t = time(NULL);
|
||||
|
||||
@ -42,9 +42,11 @@ static uint64_t time_now_sec(void) {
|
||||
|
||||
return (uint64_t)t;
|
||||
}
|
||||
#endif /* HAVE_GETTICKCOUNT64 */
|
||||
#endif /* !HAVE_GETTICKCOUNT64 || __CYGWIN__ */
|
||||
|
||||
#ifdef HAVE_CLOCK_GETTIME
|
||||
#if defined(HAVE_GETTICKCOUNT64) && !defined(__CYGWIN__)
|
||||
uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
|
||||
#elif defined(HAVE_CLOCK_GETTIME)
|
||||
uint64_t nghttp2_time_now_sec(void) {
|
||||
struct timespec tp;
|
||||
int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
|
||||
@ -55,8 +57,6 @@ uint64_t nghttp2_time_now_sec(void) {
|
||||
|
||||
return (uint64_t)tp.tv_sec;
|
||||
}
|
||||
#elif defined(HAVE_GETTICKCOUNT64)
|
||||
uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
|
||||
#else /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
|
||||
#else /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
|
||||
uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); }
|
||||
#endif /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
|
||||
#endif /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
|
||||
|
@ -21,7 +21,7 @@ This a list of all the dependencies:
|
||||
* [libuv 1.46.0][]
|
||||
* [llhttp 9.1.3][]
|
||||
* [minimatch 9.0.3][]
|
||||
* [nghttp2 1.57.0][]
|
||||
* [nghttp2 1.58.0][]
|
||||
* [nghttp3 0.7.0][]
|
||||
* [ngtcp2 0.8.1][]
|
||||
* [npm 9.6.7][]
|
||||
@ -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.57.0
|
||||
### nghttp2 1.58.0
|
||||
|
||||
The [nghttp2](https://github.com/nghttp2/nghttp2) dependency is a C library
|
||||
implementing HTTP/2 protocol.
|
||||
@ -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.57.0]: #nghttp2-1570
|
||||
[nghttp2 1.58.0]: #nghttp2-1580
|
||||
[nghttp3 0.7.0]: #nghttp3-070
|
||||
[ngtcp2 0.8.1]: #ngtcp2-081
|
||||
[npm 9.6.7]: #npm-967
|
||||
|
Loading…
Reference in New Issue
Block a user