From: Roman Arutyunyan Date: Wed, 9 Dec 2020 16:15:24 +0000 (+0000) Subject: QUIC: use client max_ack_delay when computing pto timeout. X-Git-Tag: release-1.25.0~4^2~448 X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=6f9efd423ed225bf1cf25f173aaf99cbedc57e3f;p=nginx.git QUIC: use client max_ack_delay when computing pto timeout. Previously, server max_ack_delay was used which is wrong. Also, level check is simplified. --- diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c index ace2de749..fef428625 100644 --- a/src/event/ngx_event_quic.c +++ b/src/event/ngx_event_quic.c @@ -3423,10 +3423,8 @@ ngx_quic_pto(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx) return duration; } - if (ctx == &qc->send_ctx[2] && c->ssl->handshaked) { - /* application send space */ - - duration += qc->tp.max_ack_delay << qc->pto_count; + if (ctx->level == ssl_encryption_application && c->ssl->handshaked) { + duration += qc->ctp.max_ack_delay << qc->pto_count; } return duration;