# HG changeset patch # User Vladimir Homutov # Date 1586945379 -10800 # Node ID 739f018225afcb7c08a3fe0c80ccd1073d9ec447 # Parent 76839f55bc48ad25f0a7d35ea439316494e9d0c1 Free remaining frames on connection close. Frames can still float in the following queues: - crypto frames reordering queues (one per encryption level) - moved crypto frames cleanup to the moment where all streams are closed - stream frames reordering queues (one per packet number namespace) - frames retransmit queues (one per packet number namespace) 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 @@ -750,10 +750,6 @@ ngx_quic_close_connection(ngx_connection if (qc) { - for (i = 0; i < NGX_QUIC_ENCRYPTION_LAST; i++) { - ngx_quic_free_frames(c, &qc->crypto[i].frames); - } - qc->closing = 1; tree = &qc->streams.tree; @@ -793,6 +789,15 @@ ngx_quic_close_connection(ngx_connection return; } + for (i = 0; i < NGX_QUIC_ENCRYPTION_LAST; i++) { + ngx_quic_free_frames(c, &qc->crypto[i].frames); + } + + for (i = 0; i < NGX_QUIC_SEND_CTX_LAST; i++) { + ngx_quic_free_frames(c, &qc->send_ctx[i].frames); + ngx_quic_free_frames(c, &qc->send_ctx[i].sent); + } + if (qc->push.timer_set) { ngx_del_timer(&qc->push); }