Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2eb8e9d

Browse filesBrowse files
nodejs-github-botaduh95
nodejs-github-bot
authored and
aduh95
committed
deps: update nghttp3 to 1.15.0
PR-URL: #61512 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Richard Lau <richard.lau@ibm.com>
1 parent a999edd commit 2eb8e9d
Copy full SHA for 2eb8e9d

10 files changed

+184-191Lines changed: 184 additions & 191 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/nghttp3/lib/includes/nghttp3/version.h
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*
3232
* Version number of the nghttp3 library release.
3333
*/
34-
#define NGHTTP3_VERSION "1.14.0"
34+
#define NGHTTP3_VERSION "1.15.0"
3535

3636
/**
3737
* @macro
@@ -41,6 +41,6 @@
4141
* number, 8 bits for minor and 8 bits for patch. Version 1.2.3
4242
* becomes 0x010203.
4343
*/
44-
#define NGHTTP3_VERSION_NUM 0x010e00
44+
#define NGHTTP3_VERSION_NUM 0x010f00
4545

4646
#endif /* !defined(NGHTTP3_VERSION_H) */
Collapse file

‎deps/ngtcp2/nghttp3/lib/nghttp3_conn.c‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/nghttp3/lib/nghttp3_conn.c
+28-26Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,7 +2142,7 @@ nghttp3_stream *nghttp3_conn_find_stream(nghttp3_conn *conn,
21422142

21432143
int nghttp3_conn_bind_control_stream(nghttp3_conn *conn, int64_t stream_id) {
21442144
nghttp3_stream *stream;
2145-
nghttp3_frame_entry frent;
2145+
nghttp3_frame fr;
21462146
int rv;
21472147

21482148
assert(stream_id >= 0);
@@ -2168,23 +2168,25 @@ int nghttp3_conn_bind_control_stream(nghttp3_conn *conn, int64_t stream_id) {
21682168
return rv;
21692169
}
21702170

2171-
frent.fr.settings.type = NGHTTP3_FRAME_SETTINGS;
2172-
frent.aux.settings.local_settings = &conn->local.settings;
2171+
fr.settings = (nghttp3_frame_settings){
2172+
.type = NGHTTP3_FRAME_SETTINGS,
2173+
.local_settings = &conn->local.settings,
2174+
};
21732175

2174-
rv = nghttp3_stream_frq_add(stream, &frent);
2176+
rv = nghttp3_stream_frq_add(stream, &fr);
21752177
if (rv != 0) {
21762178
return rv;
21772179
}
21782180

21792181
if (conn->local.settings.origin_list) {
21802182
assert(conn->server);
21812183

2182-
frent.fr.origin = (nghttp3_frame_origin){
2184+
fr.origin = (nghttp3_frame_origin){
21832185
.type = NGHTTP3_FRAME_ORIGIN,
21842186
.origin_list = *conn->local.settings.origin_list,
21852187
};
21862188

2187-
rv = nghttp3_stream_frq_add(stream, &frent);
2189+
rv = nghttp3_stream_frq_add(stream, &fr);
21882190
if (rv != 0) {
21892191
return rv;
21902192
}
@@ -2414,32 +2416,32 @@ static int conn_submit_headers_data(nghttp3_conn *conn, nghttp3_stream *stream,
24142416
const nghttp3_data_reader *dr) {
24152417
int rv;
24162418
nghttp3_nv *nnva;
2417-
nghttp3_frame_entry frent;
2419+
nghttp3_frame fr;
24182420

24192421
rv = nghttp3_nva_copy(&nnva, nva, nvlen, conn->mem);
24202422
if (rv != 0) {
24212423
return rv;
24222424
}
24232425

2424-
frent.fr.headers = (nghttp3_frame_headers){
2426+
fr.headers = (nghttp3_frame_headers){
24252427
.type = NGHTTP3_FRAME_HEADERS,
24262428
.nva = nnva,
24272429
.nvlen = nvlen,
24282430
};
24292431

2430-
rv = nghttp3_stream_frq_add(stream, &frent);
2432+
rv = nghttp3_stream_frq_add(stream, &fr);
24312433
if (rv != 0) {
24322434
nghttp3_nva_del(nnva, conn->mem);
24332435
return rv;
24342436
}
24352437

24362438
if (dr) {
2437-
frent.fr.data = (nghttp3_frame_data){
2439+
fr.data = (nghttp3_frame_data){
24382440
.type = NGHTTP3_FRAME_DATA,
2441+
.dr = *dr,
24392442
};
2440-
frent.aux.data.dr = *dr;
24412443

2442-
rv = nghttp3_stream_frq_add(stream, &frent);
2444+
rv = nghttp3_stream_frq_add(stream, &fr);
24432445
if (rv != 0) {
24442446
return rv;
24452447
}
@@ -2493,7 +2495,6 @@ int nghttp3_conn_submit_request(nghttp3_conn *conn, int64_t stream_id,
24932495

24942496
assert(!conn->server);
24952497
assert(conn->tx.qenc);
2496-
24972498
assert(stream_id >= 0);
24982499
assert(stream_id <= (int64_t)NGHTTP3_MAX_VARINT);
24992500
assert(nghttp3_client_stream_bidi(stream_id));
@@ -2515,6 +2516,7 @@ int nghttp3_conn_submit_request(nghttp3_conn *conn, int64_t stream_id,
25152516
}
25162517
stream->rx.hstate = NGHTTP3_HTTP_STATE_RESP_INITIAL;
25172518
stream->user_data = stream_user_data;
2519+
stream->node.pri.inc = 1;
25182520

25192521
nghttp3_http_record_request_method(stream, nva, nvlen);
25202522

@@ -2585,51 +2587,51 @@ int nghttp3_conn_submit_trailers(nghttp3_conn *conn, int64_t stream_id,
25852587
}
25862588

25872589
int nghttp3_conn_submit_shutdown_notice(nghttp3_conn *conn) {
2588-
nghttp3_frame_entry frent;
2590+
nghttp3_frame fr;
25892591
int rv;
25902592

25912593
assert(conn->tx.ctrl);
25922594

2593-
frent.fr.goaway = (nghttp3_frame_goaway){
2595+
fr.goaway = (nghttp3_frame_goaway){
25942596
.type = NGHTTP3_FRAME_GOAWAY,
25952597
.id = conn->server ? NGHTTP3_SHUTDOWN_NOTICE_STREAM_ID
25962598
: NGHTTP3_SHUTDOWN_NOTICE_PUSH_ID,
25972599
};
25982600

2599-
assert(frent.fr.goaway.id <= conn->tx.goaway_id);
2601+
assert(fr.goaway.id <= conn->tx.goaway_id);
26002602

2601-
rv = nghttp3_stream_frq_add(conn->tx.ctrl, &frent);
2603+
rv = nghttp3_stream_frq_add(conn->tx.ctrl, &fr);
26022604
if (rv != 0) {
26032605
return rv;
26042606
}
26052607

2606-
conn->tx.goaway_id = frent.fr.goaway.id;
2608+
conn->tx.goaway_id = fr.goaway.id;
26072609
conn->flags |= NGHTTP3_CONN_FLAG_GOAWAY_QUEUED;
26082610

26092611
return 0;
26102612
}
26112613

26122614
int nghttp3_conn_shutdown(nghttp3_conn *conn) {
2613-
nghttp3_frame_entry frent;
2615+
nghttp3_frame fr;
26142616
int rv;
26152617

26162618
assert(conn->tx.ctrl);
26172619

2618-
frent.fr.goaway = (nghttp3_frame_goaway){
2620+
fr.goaway = (nghttp3_frame_goaway){
26192621
.type = NGHTTP3_FRAME_GOAWAY,
26202622
.id = conn->server ? nghttp3_min_int64((1ll << 62) - 4,
26212623
conn->rx.max_stream_id_bidi + 4)
26222624
: 0,
26232625
};
26242626

2625-
assert(frent.fr.goaway.id <= conn->tx.goaway_id);
2627+
assert(fr.goaway.id <= conn->tx.goaway_id);
26262628

2627-
rv = nghttp3_stream_frq_add(conn->tx.ctrl, &frent);
2629+
rv = nghttp3_stream_frq_add(conn->tx.ctrl, &fr);
26282630
if (rv != 0) {
26292631
return rv;
26302632
}
26312633

2632-
conn->tx.goaway_id = frent.fr.goaway.id;
2634+
conn->tx.goaway_id = fr.goaway.id;
26332635
conn->flags |=
26342636
NGHTTP3_CONN_FLAG_GOAWAY_QUEUED | NGHTTP3_CONN_FLAG_SHUTDOWN_COMMENCED;
26352637

@@ -2870,7 +2872,7 @@ int nghttp3_conn_set_client_stream_priority(nghttp3_conn *conn,
28702872
const uint8_t *data,
28712873
size_t datalen) {
28722874
nghttp3_stream *stream;
2873-
nghttp3_frame_entry frent;
2875+
nghttp3_frame fr;
28742876
uint8_t *buf = NULL;
28752877

28762878
assert(!conn->server);
@@ -2895,14 +2897,14 @@ int nghttp3_conn_set_client_stream_priority(nghttp3_conn *conn,
28952897
memcpy(buf, data, datalen);
28962898
}
28972899

2898-
frent.fr.priority_update = (nghttp3_frame_priority_update){
2900+
fr.priority_update = (nghttp3_frame_priority_update){
28992901
.type = NGHTTP3_FRAME_PRIORITY_UPDATE,
29002902
.pri_elem_id = stream_id,
29012903
.data = buf,
29022904
.datalen = datalen,
29032905
};
29042906

2905-
return nghttp3_stream_frq_add(conn->tx.ctrl, &frent);
2907+
return nghttp3_stream_frq_add(conn->tx.ctrl, &fr);
29062908
}
29072909

29082910
int nghttp3_conn_set_server_stream_priority_versioned(nghttp3_conn *conn,
Collapse file

‎deps/ngtcp2/nghttp3/lib/nghttp3_frame.h‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/nghttp3/lib/nghttp3_frame.h
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ typedef struct nghttp3_frame_hd {
6060

6161
typedef struct nghttp3_frame_data {
6262
int64_t type;
63+
/* dr is set when sending DATA frame. It is not used on
64+
reception. */
65+
nghttp3_data_reader dr;
6366
} nghttp3_frame_data;
6467

6568
typedef struct nghttp3_frame_headers {
@@ -88,6 +91,9 @@ typedef struct nghttp3_frame_settings {
8891
int64_t type;
8992
size_t niv;
9093
nghttp3_settings_entry *iv;
94+
/* local_settings is set when sending SETTINGS frame. It is not
95+
used on reception. */
96+
const nghttp3_settings *local_settings;
9197
} nghttp3_frame_settings;
9298

9399
typedef struct nghttp3_frame_goaway {
Collapse file

‎deps/ngtcp2/nghttp3/lib/nghttp3_http.c‎

Copy file name to clipboardExpand all lines: deps/ngtcp2/nghttp3/lib/nghttp3_http.c
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ static int memieq(const void *a, const void *b, size_t n) {
5959
return 1;
6060
}
6161

62-
#define lstrieq(A, B, N) ((sizeof((A)) - 1) == (N) && memieq((A), (B), (N)))
62+
#define lstrieq(A, B, N) \
63+
(nghttp3_strlen_lit((A)) == (N) && memieq((A), (B), (N)))
6364

6465
static int64_t parse_uint(const uint8_t *s, size_t len) {
6566
int64_t n = 0;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.