diff options
| author | Max Romanov <max.romanov@nginx.com> | 2020-11-10 22:27:08 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2020-11-10 22:27:08 +0300 |
| commit | 896d8e8bfb3d8649db467d92e06c789b789d3feb (patch) | |
| tree | cfde57a7d1aac7d9453fbeea925efd6ac7def08f /src/nxt_unit.c | |
| parent | 5fd2933d2e54a7b5781698a670abf89b1031db44 (diff) | |
| download | unit-896d8e8bfb3d8649db467d92e06c789b789d3feb.tar.gz unit-896d8e8bfb3d8649db467d92e06c789b789d3feb.tar.bz2 | |
Fixing multi-buffer body send to application.
Application shared queue only capable to pass one shared memory buffer.
The rest buffers in chain needs to be send directly to application in response
to REQ_HEADERS_AC message.
The issue can be reproduced for configurations where 'body_buffer_size' is
greater than memory segment size (10 Mb). Requests with body size greater
than 10 Mb are just `stuck` e.g. not passed to application awaiting for more
data from router.
The bug was introduced in 1d84b9e4b459 (v1.19.0).
Diffstat (limited to 'src/nxt_unit.c')
| -rw-r--r-- | src/nxt_unit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nxt_unit.c b/src/nxt_unit.c index 23848f5b..7230552d 100644 --- a/src/nxt_unit.c +++ b/src/nxt_unit.c @@ -1357,8 +1357,14 @@ nxt_unit_process_req_body(nxt_unit_ctx_t *ctx, nxt_unit_recv_msg_t *recv_msg) if (recv_msg->incoming_buf != NULL) { b = nxt_container_of(req->content_buf, nxt_unit_mmap_buf_t, buf); + while (b->next != NULL) { + b = b->next; + } + /* "Move" incoming buffer list to req_impl. */ - nxt_unit_mmap_buf_insert_tail(&b->next, recv_msg->incoming_buf); + b->next = recv_msg->incoming_buf; + b->next->prev = &b->next; + recv_msg->incoming_buf = NULL; } @@ -2988,8 +2994,6 @@ nxt_unit_request_read(nxt_unit_request_info_t *req, void *dst, size_t size) buf_res = nxt_unit_buf_read(&req->content_buf, &req->content_length, dst, size); - nxt_unit_req_debug(req, "read: %d", (int) buf_res); - if (buf_res < (ssize_t) size && req->content_fd != -1) { res = read(req->content_fd, dst, size); if (nxt_slow_path(res < 0)) { |