Mercurial > hg > nginx
changeset 8517:924882f42dea quic
QUIC: do not artificially delay sending queued frames.
This interacts badly with retransmissions of lost packets
and can provoke spurious client retransmits.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Wed, 19 Aug 2020 13:24:54 +0300 |
parents | 355e079c5eee |
children | f9b1a4e52597 |
files | src/event/ngx_event_quic.c src/event/ngx_event_quic.h |
diffstat | 2 files changed, 1 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c Wed Aug 19 13:24:53 2020 +0300 +++ b/src/event/ngx_event_quic.c Wed Aug 19 13:24:54 2020 +0300 @@ -84,8 +84,6 @@ ngx_queue_t frames; ngx_queue_t sent; - - size_t frames_len; } ngx_quic_send_ctx_t; @@ -3351,22 +3349,11 @@ frame->len = ngx_quic_create_frame(NULL, frame); /* always succeeds */ - ctx->frames_len += frame->len; - if (qc->closing) { return; } - /* TODO: TCP_NODELAY analogue ? TCP_CORK and others... */ - - if (ctx->frames_len < NGX_QUIC_MIN_DATA_NODELAY) { - if (!qc->push.timer_set) { - ngx_add_timer(&qc->push, qc->tp.max_ack_delay); - } - - } else { - ngx_post_event(&qc->push, &ngx_posted_events); - } + ngx_post_event(&qc->push, &ngx_posted_events); } @@ -3463,7 +3450,6 @@ ngx_queue_remove(&f->queue); ngx_queue_insert_tail(&range, &f->queue); - ctx->frames_len -= f->len; len += f->len;
--- a/src/event/ngx_event_quic.h Wed Aug 19 13:24:53 2020 +0300 +++ b/src/event/ngx_event_quic.h Wed Aug 19 13:24:54 2020 +0300 @@ -49,10 +49,6 @@ #define NGX_QUIC_MIN_INITIAL_SIZE 1200 -/* if we have so much data, send immediately */ -/* TODO: configurable ? */ -#define NGX_QUIC_MIN_DATA_NODELAY 512 /* bytes */ - #define NGX_QUIC_STREAM_SERVER_INITIATED 0x01 #define NGX_QUIC_STREAM_UNIDIRECTIONAL 0x02