diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2021-10-30 02:39:19 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2021-10-30 02:39:19 +0300 |
commit | a8bc01b466e3edec205ec4ecc5d0b2b6a172c9a2 (patch) | |
tree | f1c1b128837064427cbaa8661d1d04b41fb7971a | |
parent | 3a8727888262bf6da84b1df155909e424bbb3b30 (diff) | |
download | nginx-a8bc01b466e3edec205ec4ecc5d0b2b6a172c9a2.tar.gz |
Changed ngx_chain_update_chains() to test tag first (ticket #2248).
Without this change, aio used with HTTP/2 can result in connection hang,
as observed with "aio threads; aio_write on;" and proxying (ticket #2248).
The problem is that HTTP/2 updates buffers outside of the output filters
(notably, marks them as sent), and then posts a write event to call
output filters. If a filter does not call the next one for some reason
(for example, because of an AIO operation in progress), this might
result in a state when the owner of a buffer already called
ngx_chain_update_chains() and can reuse the buffer, while the same buffer
is still sitting in the busy chain of some other filter.
In the particular case a buffer was sitting in output chain's ctx->busy,
and was reused by event pipe. Output chain's ctx->busy was permanently
blocked by it, and this resulted in connection hang.
Fix is to change ngx_chain_update_chains() to skip buffers from other
modules unconditionally, without trying to wait for these buffers to
become empty.
-rw-r--r-- | src/core/ngx_buf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ngx_buf.c b/src/core/ngx_buf.c index c3783c446..811f24d96 100644 --- a/src/core/ngx_buf.c +++ b/src/core/ngx_buf.c @@ -203,16 +203,16 @@ ngx_chain_update_chains(ngx_pool_t *p, ngx_chain_t **free, ngx_chain_t **busy, while (*busy) { cl = *busy; - if (ngx_buf_size(cl->buf) != 0) { - break; - } - if (cl->buf->tag != tag) { *busy = cl->next; ngx_free_chain(p, cl); continue; } + if (ngx_buf_size(cl->buf) != 0) { + break; + } + cl->buf->pos = cl->buf->start; cl->buf->last = cl->buf->start; |