mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-22 13:51:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

QUIC: do not artificially delay sending queued frames.

Browse Source 
This interacts badly with retransmissions of lost packets
and can provoke spurious client retransmits.
This commit is contained in:
Sergey Kandaurov 2020-08-19 13:24:54 +03:00
parent 3b83a140ff
commit f760147d9d
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/event/ngx_event_quic.c
View File

@ -84,8 +84,6 @@ typedef struct {
ngx_queue_t frames; ngx_queue_t frames;
ngx_queue_t sent; ngx_queue_t sent;
size_t frames_len;
} ngx_quic_send_ctx_t; } ngx_quic_send_ctx_t;
@ -3351,23 +3349,12 @@ ngx_quic_queue_frame(ngx_quic_connection_t *qc, ngx_quic_frame_t *frame)
frame->len = ngx_quic_create_frame(NULL, frame); frame->len = ngx_quic_create_frame(NULL, frame);
/* always succeeds */ /* always succeeds */
ctx->frames_len += frame->len;
if (qc->closing) { if (qc->closing) {
return; 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);
} }
}
static ngx_int_t static ngx_int_t
@ -3463,7 +3450,6 @@ ngx_quic_output_frames(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx)
ngx_queue_remove(&f->queue); ngx_queue_remove(&f->queue);
ngx_queue_insert_tail(&range, &f->queue); ngx_queue_insert_tail(&range, &f->queue);
ctx->frames_len -= f->len;
len += f->len; len += f->len;

4
src/event/ngx_event_quic.h
View File

@ -49,10 +49,6 @@
#define NGX_QUIC_MIN_INITIAL_SIZE 1200 #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_SERVER_INITIATED 0x01
#define NGX_QUIC_STREAM_UNIDIRECTIONAL 0x02 #define NGX_QUIC_STREAM_UNIDIRECTIONAL 0x02