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: server: fix file serving chunk restricted to max frame size from SETTINGS

Browse source 
previous fix was buggy and result in sending incomplete files.
This commit is contained in:
Yucong Sun 2021-07-21 23:45:07 -07:00 • committed by Andy Green
parent d2b87efb0a
commit a82219b0fc
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/roles/http/server/server.c
View file

@ -2954,8 +2954,21 @@ int lws_serve_http_file_fragment(struct lws *wsi)
}
#endif
poss = context->pt_serv_buf_size - (unsigned int)n -
LWS_H2_FRAME_HEADER_LENGTH;
poss = context->pt_serv_buf_size;
#if defined(LWS_ROLE_H2)
/*
* If it's h2, restrict any lump that we are sending to the
* max h2 frame size the peer indicated he could handle in
* his SETTINGS
*/
nwsi = lws_get_network_wsi(wsi);
if (nwsi->h2.h2n &&
poss > (lws_filepos_t)nwsi->h2.h2n->peer_set.s[H2SET_MAX_FRAME_SIZE])
poss = (lws_filepos_t)nwsi->h2.h2n->peer_set.s[H2SET_MAX_FRAME_SIZE];
poss = poss - (lws_filepos_t)(n - LWS_H2_FRAME_HEADER_LENGTH);
#endif
if (wsi->http.tx_content_length)
if (poss > wsi->http.tx_content_remain)
@ -3017,18 +3030,6 @@ int lws_serve_http_file_fragment(struct lws *wsi)
else
n = lws_ptr_diff(p, pstart) + (int)amount;
#if defined(LWS_ROLE_H2)
/*
* If it's h2, restrict any lump that we are sending to the
* max h2 frame size the peer indicated he could handle in
* his SETTINGS
*/
nwsi = lws_get_network_wsi(wsi);
if (nwsi->h2.h2n &&
n > (int)nwsi->h2.h2n->peer_set.s[H2SET_MAX_FRAME_SIZE])
n = (int)nwsi->h2.h2n->peer_set.s[H2SET_MAX_FRAME_SIZE];
#endif
lwsl_debug("%s: sending %d\n", __func__, n);
if (n) {