Skip to content

Commit beabcec

Browse files
deps: update nghttp2 to 1.63.0
PR-URL: #54589 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent d98cfcc commit beabcec

File tree

8 files changed

+22
-9
lines changed

8 files changed

+22
-9
lines changed

deps/nghttp2/lib/Makefile.in

+4
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
361361
LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
362362
LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
363363
LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
364+
LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS = @LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS@
365+
LIBNGTCP2_CRYPTO_WOLFSSL_LIBS = @LIBNGTCP2_CRYPTO_WOLFSSL_LIBS@
364366
LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
365367
LIBOBJS = @LIBOBJS@
366368
LIBS = @LIBS@
@@ -414,6 +416,8 @@ TESTLDADD = @TESTLDADD@
414416
VERSION = @VERSION@
415417
WARNCFLAGS = @WARNCFLAGS@
416418
WARNCXXFLAGS = @WARNCXXFLAGS@
419+
WOLFSSL_CFLAGS = @WOLFSSL_CFLAGS@
420+
WOLFSSL_LIBS = @WOLFSSL_LIBS@
417421
ZLIB_CFLAGS = @ZLIB_CFLAGS@
418422
ZLIB_LIBS = @ZLIB_LIBS@
419423
abs_builddir = @abs_builddir@

deps/nghttp2/lib/includes/Makefile.in

+4
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS = @LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS@
266266
LIBNGTCP2_CRYPTO_BORINGSSL_LIBS = @LIBNGTCP2_CRYPTO_BORINGSSL_LIBS@
267267
LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS = @LIBNGTCP2_CRYPTO_QUICTLS_CFLAGS@
268268
LIBNGTCP2_CRYPTO_QUICTLS_LIBS = @LIBNGTCP2_CRYPTO_QUICTLS_LIBS@
269+
LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS = @LIBNGTCP2_CRYPTO_WOLFSSL_CFLAGS@
270+
LIBNGTCP2_CRYPTO_WOLFSSL_LIBS = @LIBNGTCP2_CRYPTO_WOLFSSL_LIBS@
269271
LIBNGTCP2_LIBS = @LIBNGTCP2_LIBS@
270272
LIBOBJS = @LIBOBJS@
271273
LIBS = @LIBS@
@@ -319,6 +321,8 @@ TESTLDADD = @TESTLDADD@
319321
VERSION = @VERSION@
320322
WARNCFLAGS = @WARNCFLAGS@
321323
WARNCXXFLAGS = @WARNCXXFLAGS@
324+
WOLFSSL_CFLAGS = @WOLFSSL_CFLAGS@
325+
WOLFSSL_LIBS = @WOLFSSL_LIBS@
322326
ZLIB_CFLAGS = @ZLIB_CFLAGS@
323327
ZLIB_LIBS = @ZLIB_LIBS@
324328
abs_builddir = @abs_builddir@

deps/nghttp2/lib/includes/nghttp2/nghttp2.h

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ extern "C" {
7272
# endif /* !BUILDING_NGHTTP2 */
7373
#endif /* !defined(WIN32) */
7474

75+
#ifdef BUILDING_NGHTTP2
76+
# undef NGHTTP2_NO_SSIZE_T
77+
#endif /* BUILDING_NGHTTP2 */
78+
7579
/**
7680
* @typedef
7781
*

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.62.1"
32+
#define NGHTTP2_VERSION "1.63.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 0x013e01
40+
#define NGHTTP2_VERSION_NUM 0x013f00
4141

4242
#endif /* NGHTTP2VER_H */

deps/nghttp2/lib/nghttp2_extpri.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri);
6060
* nghttp2_extpri_uint8_inc extracts inc from |PRI| which is supposed to
6161
* be constructed by nghttp2_extpri_to_uint8.
6262
*/
63-
#define nghttp2_extpri_uint8_inc(PRI) (((PRI)&NGHTTP2_EXTPRI_INC_MASK) != 0)
63+
#define nghttp2_extpri_uint8_inc(PRI) (((PRI) & NGHTTP2_EXTPRI_INC_MASK) != 0)
6464

6565
#endif /* NGHTTP2_EXTPRI_H */

deps/nghttp2/lib/nghttp2_hd.c

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@
3535
/* Make scalar initialization form of nghttp2_hd_entry */
3636
#define MAKE_STATIC_ENT(N, V, T, H) \
3737
{ \
38-
{NULL, NULL, (uint8_t *)(N), sizeof((N)) - 1, -1}, \
39-
{NULL, NULL, (uint8_t *)(V), sizeof((V)) - 1, -1}, \
40-
{(uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0}, \
41-
T, H \
38+
{NULL, NULL, (uint8_t *)(N), sizeof((N)) - 1, -1}, \
39+
{NULL, NULL, (uint8_t *)(V), sizeof((V)) - 1, -1}, \
40+
{(uint8_t *)(N), (uint8_t *)(V), sizeof((N)) - 1, sizeof((V)) - 1, 0}, \
41+
T, \
42+
H, \
4243
}
4344

4445
/* Generated by mkstatictbl.py */

deps/nghttp2/lib/nghttp2_helper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ nghttp2_min_def(size, size_t);
6464
#define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0)
6565

6666
#define nghttp2_struct_of(ptr, type, member) \
67-
((type *)(void *)((char *)(ptr)-offsetof(type, member)))
67+
((type *)(void *)((char *)(ptr) - offsetof(type, member)))
6868

6969
/*
7070
* Copies 2 byte unsigned integer |n| in host byte order to |buf| in

deps/nghttp2/lib/nghttp2_submit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#include <nghttp2/nghttp2.h>
3333

34-
typedef struct nghttp2_data_provider_wrap nghttp2_data_provider_wrap;
34+
#include "nghttp2_outbound_item.h"
3535

3636
int nghttp2_submit_data_shared(nghttp2_session *session, uint8_t flags,
3737
int32_t stream_id,

0 commit comments

Comments
 (0)