Skip to content

Commit 6c41b50

Browse files
nodejs-github-botUlisesGascon
authored andcommitted
deps: update nghttp2 to 1.58.0
PR-URL: #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>
1 parent 5d48ef7 commit 6c41b50

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
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.57.0"
32+
#define NGHTTP2_VERSION "1.58.0"
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 0x013900
40+
#define NGHTTP2_VERSION_NUM 0x013a00
4141

4242
#endif /* NGHTTP2VER_H */

deps/nghttp2/lib/nghttp2_map.c

+2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ static void map_bucket_set_data(nghttp2_map_bucket *bkt, uint32_t hash,
126126
bkt->data = data;
127127
}
128128

129+
#ifndef WIN32
129130
void nghttp2_map_print_distance(nghttp2_map *map) {
130131
uint32_t i;
131132
size_t idx;
@@ -145,6 +146,7 @@ void nghttp2_map_print_distance(nghttp2_map *map) {
145146
distance(map->tablelen, map->tablelenbits, bkt, idx));
146147
}
147148
}
149+
#endif /* !WIN32 */
148150

149151
static int insert(nghttp2_map_bucket *table, uint32_t tablelen,
150152
uint32_t tablelenbits, uint32_t hash,

deps/nghttp2/lib/nghttp2_map.h

+2
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ size_t nghttp2_map_size(nghttp2_map *map);
131131
int nghttp2_map_each(nghttp2_map *map, int (*func)(void *data, void *ptr),
132132
void *ptr);
133133

134+
#ifndef WIN32
134135
void nghttp2_map_print_distance(nghttp2_map *map);
136+
#endif /* !WIN32 */
135137

136138
#endif /* NGHTTP2_MAP_H */

deps/nghttp2/lib/nghttp2_time.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# include <sysinfoapi.h>
3333
#endif /* HAVE_SYSINFOAPI_H */
3434

35-
#ifndef HAVE_GETTICKCOUNT64
35+
#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
3636
static uint64_t time_now_sec(void) {
3737
time_t t = time(NULL);
3838

@@ -42,9 +42,11 @@ static uint64_t time_now_sec(void) {
4242

4343
return (uint64_t)t;
4444
}
45-
#endif /* HAVE_GETTICKCOUNT64 */
45+
#endif /* !HAVE_GETTICKCOUNT64 || __CYGWIN__ */
4646

47-
#ifdef HAVE_CLOCK_GETTIME
47+
#if defined(HAVE_GETTICKCOUNT64) && !defined(__CYGWIN__)
48+
uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
49+
#elif defined(HAVE_CLOCK_GETTIME)
4850
uint64_t nghttp2_time_now_sec(void) {
4951
struct timespec tp;
5052
int rv = clock_gettime(CLOCK_MONOTONIC, &tp);
@@ -55,8 +57,6 @@ uint64_t nghttp2_time_now_sec(void) {
5557

5658
return (uint64_t)tp.tv_sec;
5759
}
58-
#elif defined(HAVE_GETTICKCOUNT64)
59-
uint64_t nghttp2_time_now_sec(void) { return GetTickCount64() / 1000; }
60-
#else /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
60+
#else /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
6161
uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); }
62-
#endif /* !HAVE_CLOCK_GETTIME && !HAVE_GETTICKCOUNT64 */
62+
#endif /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */

doc/contributing/maintaining/maintaining-dependencies.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This a list of all the dependencies:
2121
* [libuv 1.46.0][]
2222
* [llhttp 8.1.0][]
2323
* [minimatch 9.0.3][]
24-
* [nghttp2 1.57.0][]
24+
* [nghttp2 1.58.0][]
2525
* [nghttp3 0.7.0][]
2626
* [ngtcp2 0.8.1][]
2727
* [npm 9.6.7][]
@@ -223,7 +223,7 @@ See [maintaining-http][] for more informations.
223223
The [minimatch](https://github.com/isaacs/minimatch) dependency is a
224224
minimal matching utility.
225225

226-
### nghttp2 1.57.0
226+
### nghttp2 1.58.0
227227

228228
The [nghttp2](https://github.com/nghttp2/nghttp2) dependency is a C library
229229
implementing HTTP/2 protocol.
@@ -338,7 +338,7 @@ performance improvements not currently available in standard zlib.
338338
[maintaining-openssl]: ./maintaining-openssl.md
339339
[maintaining-web-assembly]: ./maintaining-web-assembly.md
340340
[minimatch 9.0.3]: #minimatch-903
341-
[nghttp2 1.57.0]: #nghttp2-1570
341+
[nghttp2 1.58.0]: #nghttp2-1580
342342
[nghttp3 0.7.0]: #nghttp3-070
343343
[ngtcp2 0.8.1]: #ngtcp2-081
344344
[npm 9.6.7]: #npm-967

0 commit comments

Comments
 (0)