mirror of
https://github.com/nginx/nginx.git
synced 2026-11-20 07:02:58 +00:00
QUIC: avoid main connection reuse after creating a stream
Previously, ngx_quic_create_stream() cleared the main connection's reusable flag and then called ngx_get_connection() before inserting the new stream into the tree. If the worker was low on free connections, the drain inside ngx_get_connection() could close an idle stream of the same main connection. Since the new stream was not in the tree yet, that close found no remaining streams and marked the main connection reusable again. Once reusable, the connection could later be drained while processing one of its streams, for example when connecting to an upstream, freeing it while still in use. Fix is to insert the new stream into the tree before calling ngx_get_connection(), so the main connection is not considered idle. Reported by Xint.io.
This commit is contained in:
parent
1d1d861a5e
commit
b5252dae1c
1 changed files with 4 additions and 2 deletions
|
|
@ -731,12 +731,15 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id)
|
|||
addr_text.data = NULL;
|
||||
}
|
||||
|
||||
ngx_rbtree_insert(&qc->streams.tree, &qs->node);
|
||||
|
||||
reusable = c->reusable;
|
||||
ngx_reusable_connection(c, 0);
|
||||
|
||||
sc = ngx_get_connection(c->fd, log);
|
||||
if (sc == NULL) {
|
||||
ngx_destroy_pool(pool);
|
||||
ngx_rbtree_delete(&qc->streams.tree, &qs->node);
|
||||
ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
|
||||
ngx_reusable_connection(c, reusable);
|
||||
return NULL;
|
||||
|
|
@ -803,6 +806,7 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id)
|
|||
if (cln == NULL) {
|
||||
ngx_close_connection(sc);
|
||||
ngx_destroy_pool(pool);
|
||||
ngx_rbtree_delete(&qc->streams.tree, &qs->node);
|
||||
ngx_queue_insert_tail(&qc->streams.free, &qs->queue);
|
||||
ngx_reusable_connection(c, reusable);
|
||||
return NULL;
|
||||
|
|
@ -811,8 +815,6 @@ ngx_quic_create_stream(ngx_connection_t *c, uint64_t id)
|
|||
cln->handler = ngx_quic_stream_cleanup_handler;
|
||||
cln->data = sc;
|
||||
|
||||
ngx_rbtree_insert(&qc->streams.tree, &qs->node);
|
||||
|
||||
return qs;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue