Commit 189e5e5
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 886fc48 commit 189e5e5
5 files changed
Lines changed: 16 additions & 12 deletions
File tree
- deps/nghttp2/lib
- includes/nghttp2
- doc/contributing/maintaining
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -29,14 +29,14 @@ | |||
| 29 | 29 | * @macro | |
| 30 | 30 | * Version number of the nghttp2 library release | |
| 31 | 31 | */ | |
| 32 | - #define NGHTTP2_VERSION "1.57.0" | ||
| 32 | + #define NGHTTP2_VERSION "1.58.0" | ||
| 33 | 33 | ||
| 34 | 34 | /** | |
| 35 | 35 | * @macro | |
| 36 | 36 | * Numerical representation of the version number of the nghttp2 library | |
| 37 | 37 | * release. This is a 24 bit number with 8 bits for major number, 8 bits | |
| 38 | 38 | * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. | |
| 39 | 39 | */ | |
| 40 | - #define NGHTTP2_VERSION_NUM 0x013900 | ||
| 40 | + #define NGHTTP2_VERSION_NUM 0x013a00 | ||
| 41 | 41 | ||
| 42 | 42 | #endif /* NGHTTP2VER_H */ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -126,6 +126,7 @@ static void map_bucket_set_data(nghttp2_map_bucket *bkt, uint32_t hash, | |||
| 126 | 126 | bkt->data = data; | |
| 127 | 127 | } | |
| 128 | 128 | ||
| 129 | + #ifndef WIN32 | ||
| 129 | 130 | void nghttp2_map_print_distance(nghttp2_map *map) { | |
| 130 | 131 | uint32_t i; | |
| 131 | 132 | size_t idx; | |
@@ -145,6 +146,7 @@ void nghttp2_map_print_distance(nghttp2_map *map) { | |||
| 145 | 146 | distance(map->tablelen, map->tablelenbits, bkt, idx)); | |
| 146 | 147 | } | |
| 147 | 148 | } | |
| 149 | + #endif /* !WIN32 */ | ||
| 148 | 150 | ||
| 149 | 151 | static int insert(nghttp2_map_bucket *table, uint32_t tablelen, | |
| 150 | 152 | uint32_t tablelenbits, uint32_t hash, | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -131,6 +131,8 @@ size_t nghttp2_map_size(nghttp2_map *map); | |||
| 131 | 131 | int nghttp2_map_each(nghttp2_map *map, int (*func)(void *data, void *ptr), | |
| 132 | 132 | void *ptr); | |
| 133 | 133 | ||
| 134 | + #ifndef WIN32 | ||
| 134 | 135 | void nghttp2_map_print_distance(nghttp2_map *map); | |
| 136 | + #endif /* !WIN32 */ | ||
| 135 | 137 | ||
| 136 | 138 | #endif /* NGHTTP2_MAP_H */ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,7 +32,7 @@ | |||
| 32 | 32 | # include <sysinfoapi.h> | |
| 33 | 33 | #endif /* HAVE_SYSINFOAPI_H */ | |
| 34 | 34 | ||
| 35 | - #ifndef HAVE_GETTICKCOUNT64 | ||
| 35 | + #if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__) | ||
| 36 | 36 | static uint64_t time_now_sec(void) { | |
| 37 | 37 | time_t t = time(NULL); | |
| 38 | 38 | ||
@@ -42,9 +42,11 @@ static uint64_t time_now_sec(void) { | |||
| 42 | 42 | ||
| 43 | 43 | return (uint64_t)t; | |
| 44 | 44 | } | |
| 45 | - #endif /* HAVE_GETTICKCOUNT64 */ | ||
| 45 | + #endif /* !HAVE_GETTICKCOUNT64 || __CYGWIN__ */ | ||
| 46 | 46 | ||
| 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) | ||
| 48 | 50 | uint64_t nghttp2_time_now_sec(void) { | |
| 49 | 51 | struct timespec tp; | |
| 50 | 52 | int rv = clock_gettime(CLOCK_MONOTONIC, &tp); | |
@@ -55,8 +57,6 @@ uint64_t nghttp2_time_now_sec(void) { | |||
| 55 | 57 | ||
| 56 | 58 | return (uint64_t)tp.tv_sec; | |
| 57 | 59 | } | |
| 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 */ | ||
| 61 | 61 | 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 */ | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ This a list of all the dependencies: | |||
| 21 | 21 | * [libuv 1.46.0][] | |
| 22 | 22 | * [llhttp 9.1.3][] | |
| 23 | 23 | * [minimatch 9.0.3][] | |
| 24 | - * [nghttp2 1.57.0][] | ||
| 24 | + * [nghttp2 1.58.0][] | ||
| 25 | 25 | * [nghttp3 0.7.0][] | |
| 26 | 26 | * [ngtcp2 0.8.1][] | |
| 27 | 27 | * [npm 9.6.7][] | |
@@ -223,7 +223,7 @@ See [maintaining-http][] for more informations. | |||
| 223 | 223 | The [minimatch](https://github.com/isaacs/minimatch) dependency is a | |
| 224 | 224 | minimal matching utility. | |
| 225 | 225 | ||
| 226 | - ### nghttp2 1.57.0 | ||
| 226 | + ### nghttp2 1.58.0 | ||
| 227 | 227 | ||
| 228 | 228 | The [nghttp2](https://github.com/nghttp2/nghttp2) dependency is a C library | |
| 229 | 229 | implementing HTTP/2 protocol. | |
@@ -338,7 +338,7 @@ performance improvements not currently available in standard zlib. | |||
| 338 | 338 | [maintaining-openssl]: ./maintaining-openssl.md | |
| 339 | 339 | [maintaining-web-assembly]: ./maintaining-web-assembly.md | |
| 340 | 340 | [minimatch 9.0.3]: #minimatch-903 | |
| 341 | - [nghttp2 1.57.0]: #nghttp2-1570 | ||
| 341 | + [nghttp2 1.58.0]: #nghttp2-1580 | ||
| 342 | 342 | [nghttp3 0.7.0]: #nghttp3-070 | |
| 343 | 343 | [ngtcp2 0.8.1]: #ngtcp2-081 | |
| 344 | 344 | [npm 9.6.7]: #npm-967 | |
0 commit comments