technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Releasing shm buffers for large body requests.

Browse Source 
This fixes memory and shm file descriptor leakage that occurred when a large
request body was passed via shared memory.  The leakage was caught with the
"test_settings_body_buffer_size" test.  The main condition is the
"body_buffer_size" value exceeding 10 Mb (a shm segment).  Thus, the router was
forced to split the body into several shm segments, but these buffers were not
freed because of dummy completion handlers.
This commit is contained in:
Max Romanov
2021-03-25 14:16:30 +03:00
parent d2b0882d89
commit 9957a959df
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nxt_router.c
View File

@@ -523,12 +523,11 @@ nxt_router_msg_cancel(nxt_task_t *task, nxt_request_rpc_data_t *req_rpc_data)
next = b->next; next = b->next;
b->next = NULL; b->next = NULL;
b->completion_handler = msg_info->completion_handler;
if (b->is_port_mmap_sent) { if (b->is_port_mmap_sent) {
b->is_port_mmap_sent = cancelled == 0; b->is_port_mmap_sent = cancelled == 0;
b->completion_handler(task, b, b->parent);
} }
b->completion_handler(task, b, b->parent);
} }
msg_info->buf = NULL; msg_info->buf = NULL;
@@ -4113,6 +4112,8 @@ nxt_router_req_headers_ack_handler(nxt_task_t *task,
if (b != NULL) { if (b != NULL) {
/* First buffer is already sent. Start from second. */ /* First buffer is already sent. Start from second. */
b = b->next; b = b->next;
req_rpc_data->msg_info.buf->next = NULL;
} }
if (req_rpc_data->msg_info.body_fd != -1 || b != NULL) { if (req_rpc_data->msg_info.body_fd != -1 || b != NULL) {
@@ -5025,14 +5026,6 @@ nxt_router_app_prepare_request(nxt_task_t *task,
port->socket.fd); port->socket.fd);
req_rpc_data->msg_info.buf = buf; req_rpc_data->msg_info.buf = buf;
req_rpc_data->msg_info.completion_handler = buf->completion_handler;
do {
buf->completion_handler = nxt_router_dummy_buf_completion;
buf = buf->next;
} while (buf != NULL);
buf = req_rpc_data->msg_info.buf;
body = req_rpc_data->request->body; body = req_rpc_data->request->body;

1
src/nxt_router_request.h
View File

@@ -11,7 +11,6 @@ typedef struct {
nxt_buf_t *buf; nxt_buf_t *buf;
nxt_fd_t body_fd; nxt_fd_t body_fd;
uint32_t tracking_cookie; uint32_t tracking_cookie;
nxt_work_handler_t completion_handler;
} nxt_msg_info_t; } nxt_msg_info_t;