QUIC: removed cancelable flag from QUIC and HTTP/3 events.

All these events are created in context of a client connection and are deleted
when the connection is closed.  Setting ev->cancelable could trigger premature
connection closure and a socket leak alert.

diff --git a/src/event/quic/ngx_event_quic.c b/src/event/quic/ngx_event_quic.c
index a28f5a7ac48209eac7b5dbc7ed083b2a4fdf39bc..9b342d7debbc398c8fdf21ad21ea7bb0c9e29753 100644 (file)
--- a/src/event/quic/ngx_event_quic.c
+++ b/src/event/quic/ngx_event_quic.c
@@ -275,22 +275,18 @@ ngx_quic_new_connection(ngx_connection_t *c, ngx_quic_conf_t *conf,
     qc->pto.log = c->log;
     qc->pto.data = c;
     qc->pto.handler = ngx_quic_pto_handler;
-    qc->pto.cancelable = 1;
 
     qc->push.log = c->log;
     qc->push.data = c;
     qc->push.handler = ngx_quic_push_handler;
-    qc->push.cancelable = 1;
 
     qc->close.log = c->log;
     qc->close.data = c;
     qc->close.handler = ngx_quic_close_handler;
-    qc->close.cancelable = 1;
 
     qc->path_validation.log = c->log;
     qc->path_validation.data = c;
     qc->path_validation.handler = ngx_quic_path_validation_handler;
-    qc->path_validation.cancelable = 1;
 
     qc->conf = conf;
 

diff --git a/src/http/v3/ngx_http_v3.c b/src/http/v3/ngx_http_v3.c
index b9956e68f5c5a063e119629ab1360f834bf6d995..70f3979852dfa32fe614d904ebaffd9f9847b39d 100644 (file)
--- a/src/http/v3/ngx_http_v3.c
+++ b/src/http/v3/ngx_http_v3.c
@@ -55,7 +55,6 @@ ngx_http_v3_init_session(ngx_connection_t *c)
     h3c->keepalive.log = pc->log;
     h3c->keepalive.data = pc;
     h3c->keepalive.handler = ngx_http_v3_keepalive_handler;
-    h3c->keepalive.cancelable = 1;
 
     h3c->table.send_insert_count.log = pc->log;
     h3c->table.send_insert_count.data = pc;