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

Fixing master process crash after failed fork.

Browse Source 
This closes #312 issue on GitHub.
This commit is contained in:
Max Romanov
2019-09-18 22:45:30 +03:00
parent ab40ce3757
commit 1fac43eebe
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nxt_main_process.c
View File

@@ -690,15 +690,18 @@ nxt_main_create_worker_process(nxt_task_t *task, nxt_runtime_t *rt,
pid = nxt_process_create(task, process); pid = nxt_process_create(task, process);
nxt_port_use(task, port, -1);
switch (pid) { switch (pid) {
case -1: case -1:
nxt_port_close(task, port);
nxt_port_use(task, port, -1);
return NXT_ERROR; return NXT_ERROR;
case 0: case 0:
/* A worker process, return to the event engine work queue loop. */ /* A worker process, return to the event engine work queue loop. */
nxt_port_use(task, port, -1);
return NXT_AGAIN; return NXT_AGAIN;
default: default:
@@ -707,6 +710,8 @@ nxt_main_create_worker_process(nxt_task_t *task, nxt_runtime_t *rt,
nxt_port_read_close(port); nxt_port_read_close(port);
nxt_port_write_enable(task, port); nxt_port_write_enable(task, port);
nxt_port_use(task, port, -1);
return NXT_OK; return NXT_OK;
} }
} }

2
src/nxt_port.c
View File

@@ -546,7 +546,7 @@ nxt_port_use(nxt_task_t *task, nxt_port_t *port, int i)
if (i < 0 && c == -i) { if (i < 0 && c == -i) {
if (task->thread->engine == port->engine) { if (port->engine == NULL || task->thread->engine == port->engine) {
nxt_port_release(task, port); nxt_port_release(task, port);
return; return;