aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoman Arutyunyan <arut@nginx.com>2022-01-25 09:45:50 +0300
committerRoman Arutyunyan <arut@nginx.com>2022-01-25 09:45:50 +0300
commitc40382267432d741d9ef24aecdec55d1768ae448 (patch)
tree7b2ec747d20e526750e6b6e29eb6fa5e28fa159d /src
parenta0aa287d13ef8d9b6916d3b52e9bfa2aa30871fe (diff)
downloadnginx-c40382267432d741d9ef24aecdec55d1768ae448.tar.gz
nginx-c40382267432d741d9ef24aecdec55d1768ae448.zip
QUIC: fixed chain returned from ngx_quic_write_chain().
Previously, when input ended on a QUIC buffer boundary, input chain was not advanced to the next buffer. As a result, ngx_quic_write_chain() returned a chain with an empty buffer instead of NULL. This broke HTTP write filter, preventing it from closing the HTTP request and eventually timing out. Now input chain is always advanced to a buffer that has data, before checking QUIC buffer boundary condition.
Diffstat (limited to 'src')
-rw-r--r--src/event/quic/ngx_event_quic_frames.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/event/quic/ngx_event_quic_frames.c b/src/event/quic/ngx_event_quic_frames.c
index 851af4643..951b6e8a2 100644
--- a/src/event/quic/ngx_event_quic_frames.c
+++ b/src/event/quic/ngx_event_quic_frames.c
@@ -536,14 +536,16 @@ ngx_quic_write_chain(ngx_connection_t *c, ngx_chain_t **chain, ngx_chain_t *in,
continue;
}
- for (p = b->pos + offset; p != b->last && in; /* void */ ) {
+ p = b->pos + offset;
+
+ while (in) {
if (!ngx_buf_in_memory(in->buf) || in->buf->pos == in->buf->last) {
in = in->next;
continue;
}
- if (limit == 0) {
+ if (p == b->last || limit == 0) {
break;
}