Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

h2: ack SETTINGS just the once

Browse source
This commit is contained in:
Andy Green 2019-10-02 08:55:12 -07:00
parent b40e19edca
commit 6feb51fd42
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/core-net/private-lib-core-net.h
View file

@ -692,6 +692,7 @@ struct lws {
unsigned int h2_stream_immortal:1;
unsigned int h2_stream_carries_ws:1; /* immortal set as well */
unsigned int h2_stream_carries_sse:1; /* immortal set as well */
unsigned int h2_acked_settings:1;
unsigned int seen_nonpseudoheader:1;
unsigned int listener:1;
unsigned int user_space_externally_allocated:1;

27
lib/roles/h2/http2.c
View file

@ -1032,11 +1032,19 @@ lws_h2_parse_frame_header(struct lws *wsi)
if (h2n->type == LWS_H2_FRAME_TYPE_COUNT)
return 0;
if (wsi->upgraded_to_http2) {
if (wsi->upgraded_to_http2 &&
#if defined(LWS_WITH_CLIENT)
(!(wsi->flags & LCCSCF_H2_QUIRK_NGHTTP2_END_STREAM) ||
#else
(
#endif
!wsi->h2_acked_settings)) {
pps = lws_h2_new_pps(LWS_H2_PPS_ACK_SETTINGS);
if (!pps)
return 1;
lws_pps_schedule(wsi, pps);
wsi->h2_acked_settings = 1;
}
break;
}
@ -1353,11 +1361,18 @@ lws_h2_parse_end_of_frame(struct lws *wsi)
lws_callback_on_writable(h2n->swsi);
pps = lws_h2_new_pps(LWS_H2_PPS_ACK_SETTINGS);
if (!pps)
return 1;
lws_pps_schedule(wsi, pps);
lwsl_info("%s: scheduled settings ack PPS\n", __func__);
if (!wsi->h2_acked_settings
#if defined(LWS_WITH_CLIENT)
|| !(wsi->flags & LCCSCF_H2_QUIRK_NGHTTP2_END_STREAM)
#endif
) {
pps = lws_h2_new_pps(LWS_H2_PPS_ACK_SETTINGS);
if (!pps)
return 1;
lws_pps_schedule(wsi, pps);
lwsl_info("%s: scheduled settings ack PPS\n", __func__);
wsi->h2_acked_settings = 1;
}
/* also attach any queued guys */