Mercurial > hg > nginx

changeset 8392:5ffb21c5c93d quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed frame retransmissions. It was possible that retransmit timer was not set after the first retransmission attempt, due to ngx_quic_retransmit() did not set wait time properly, and the condition in retransmit handler was incorrect.
author Vladimir Homutov <vl@nginx.com>
date Mon, 18 May 2020 13:54:35 +0300
parents 2d5db7faa788
children e169cce912c7
files src/event/ngx_event_quic.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -3196,7 +3196,7 @@ ngx_quic_retransmit_handler(ngx_event_t 
         if (i == 0) {
             wait = nswait;
 
-        } else if (nswait > 0 && nswait < wait) {
+        } else if (nswait > 0 && (wait == 0 || wait > nswait)) {
             wait = nswait;
         }
     }
@@ -3289,6 +3289,8 @@ ngx_quic_retransmit(ngx_connection_t *c,
         /* move frames group to the end of queue */
         ngx_queue_add(&ctx->sent, &range);
 
+        wait = qc->tp.max_ack_delay;
+
     } while (q != ngx_queue_sentinel(&ctx->sent));
 
     *waitp = wait;