Mercurial > hg > nginx

changeset 9065:2ee6f9729739 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QUIC: set stream error flag on reset. Now, when RESET_STREAM is sent or received, or when streams are closed, stream connection error flag is set. Previously, only stream state was changed, which resulted in setting the error flag only after calling recv()/send()/send_chain(). However, there are cases when none of these functions is called, but it's still important to know if the stream is being closed. For example, when an HTTP/3 request stream is blocked on insert count, receiving RESET_STREAM should trigger stream closure, which was not the case. The change also fixes ngx_http_upstream_check_broken_connection() and ngx_http_test_reading() with QUIC streams.
author Roman Arutyunyan <arut@nginx.com>
date Tue, 10 Jan 2023 17:42:40 +0400
parents 35e27117b593
children eaa8dc3788e1
files src/event/quic/ngx_event_quic_streams.c
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/quic/ngx_event_quic_streams.c	Tue Jan 10 14:05:18 2023 +0400
+++ b/src/event/quic/ngx_event_quic_streams.c	Tue Jan 10 17:42:40 2023 +0400
@@ -203,6 +203,9 @@
             continue;
         }
 
+        sc->read->error = 1;
+        sc->write->error = 1;
+
         ngx_quic_set_event(sc->read);
         ngx_quic_set_event(sc->write);
 
@@ -245,6 +248,10 @@
     qs->send_state = NGX_QUIC_STREAM_SEND_RESET_SENT;
     qs->send_final_size = qs->send_offset;
 
+    if (qs->connection) {
+        qs->connection->write->error = 1;
+    }
+
     pc = qs->parent;
     qc = ngx_quic_get_connection(pc);
 
@@ -805,7 +812,6 @@
         || qs->recv_state == NGX_QUIC_STREAM_RECV_RESET_READ)
     {
         qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_READ;
-        rev->error = 1;
         return NGX_ERROR;
     }
 
@@ -1383,6 +1389,7 @@
 ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
     ngx_quic_header_t *pkt, ngx_quic_reset_stream_frame_t *f)
 {
+    ngx_event_t            *rev;
     ngx_quic_stream_t      *qs;
     ngx_quic_connection_t  *qc;
 
@@ -1439,7 +1446,10 @@
         return ngx_quic_close_stream(qs);
     }
 
-    ngx_quic_set_event(qs->connection->read);
+    rev = qs->connection->read;
+    rev->error = 1;
+
+    ngx_quic_set_event(rev);
 
     return NGX_OK;
 }