mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-30 18:16:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: call stream read handler on new data arrival.

Browse Source 
This was broken in b3f6ad181df4.
This commit is contained in:
Roman Arutyunyan 2021-05-26 13:07:06 +03:00
parent 1677503f98
commit 27a24f4c6b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/event/quic/ngx_event_quic_streams.c
View File

@ -814,6 +814,7 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
{
uint64_t last;
ngx_pool_t *pool;
ngx_event_t *rev;
ngx_connection_t *sc;
ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc;
@ -895,9 +896,7 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
f->offset = qs->recv_offset;
}
if (f->offset == qs->recv_offset) {
qs->connection->read->ready = 1;
}
rev = qs->connection->read;
if (f->fin) {
if (qs->final_size != (uint64_t) -1 && qs->final_size != last) {
@ -910,12 +909,26 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
return NGX_ERROR;
}
qs->connection->read->pending_eof = 1;
rev->pending_eof = 1;
qs->final_size = last;
}
return ngx_quic_order_bufs(c, &qs->in, frame->data,
f->offset - qs->recv_offset);
if (ngx_quic_order_bufs(c, &qs->in, frame->data,
f->offset - qs->recv_offset)
!= NGX_OK)
{
return NGX_ERROR;
}
if (f->offset == qs->recv_offset) {
rev->ready = 1;
if (rev->active) {
rev->handler(rev);
}
}
return NGX_OK;
cleanup: