Mercurial > hg > nginx

changeset 8294:32db41d603cd quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed handling QUIC stream eof. Set r->pending_eof flag for a new QUIC stream with the fin bit. Also, keep r->ready set when r->pending_eof is set and buffer is empty.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 27 Mar 2020 10:02:45 +0300
parents 1ec905f4d851
children 5649079a41f4
files src/event/ngx_event_quic.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -1157,7 +1157,12 @@ ngx_quic_handle_stream_frame(ngx_connect
     b = sn->b;
     b->last = ngx_cpymem(b->last, f->data, f->length);
 
-    sn->c->read->ready = 1;
+    rev = sn->c->read;
+    rev->ready = 1;
+
+    if (f->fin) {
+        rev->pending_eof = 1;
+    }
 
     qc->streams.handler(sn->c);
 
@@ -1595,7 +1600,7 @@ ngx_quic_stream_recv(ngx_connection_t *c
     if (b->pos == b->last) {
         b->pos = b->start;
         b->last = b->start;
-        rev->ready = 0;
+        rev->ready = rev->pending_eof;
     }
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,