HTTP/2: do not block the output queue on trailers

Unlike response headers, trailers are queued along with the stream data.
Blocking the queue on them would hold back every frame queued later,
including higher priority streams.

Also, this way unsent trailers are discarded along with the stream data
when the stream is reset.
This commit is contained in:
Sergey Kandaurov 2026-09-25 15:34:44 +00:00
parent 61031503dc
commit 867aefddbc

View file

@ -1227,6 +1227,7 @@ ngx_http_v2_send_chain(ngx_connection_t *fc, ngx_chain_t *in, off_t limit)
}
if (trailers != NGX_HTTP_V2_NO_TRAILERS) {
trailers->blocked = 0;
cl->buf->last_buf = 0;
}
}
@ -1732,7 +1733,9 @@ ngx_http_v2_filter_cleanup(void *data)
if (frame->stream == stream && !frame->blocked) {
*fn = frame->next;
window += frame->length;
if (frame->handler == ngx_http_v2_data_frame_handler) {
window += frame->length;
}
if (--stream->queued == 0) {
break;