# HG changeset patch # User Vladimir Homutov # Date 1603746864 -10800 # Node ID b1676cd64dc90a5960baceba9981d439c9b54168 # Parent e2086d8181fab3e98eadfc7ed3a780467f606a40 QUIC: cleanup send context properly. The patch resets ctx->frames queue, which may contain frames. It was possible that congestion or amplification limits prevented all frames to be sent. Retransmitted frames could be accounted twice as inflight: first time in ngx_quic_congestion_lost() called from ngx_quic_resend_frames(), and later from ngx_quic_discard_ctx(). diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c --- a/src/event/ngx_event_quic.c +++ b/src/event/ngx_event_quic.c @@ -2254,6 +2254,15 @@ ngx_quic_discard_ctx(ngx_connection_t *c ngx_quic_free_frame(c, f); } + while (!ngx_queue_empty(&ctx->frames)) { + q = ngx_queue_head(&ctx->frames); + ngx_queue_remove(q); + + f = ngx_queue_data(q, ngx_quic_frame_t, queue); + ngx_quic_congestion_ack(c, f); + ngx_quic_free_frame(c, f); + } + ctx->send_ack = 0; } @@ -5677,6 +5686,7 @@ ngx_quic_congestion_lost(ngx_connection_ cg = &qc->congestion; cg->in_flight -= f->plen; + f->plen = 0; timer = f->last - cg->recovery_start;