diff options
| author | Max Romanov <max.romanov@nginx.com> | 2018-10-02 19:46:06 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2018-10-02 19:46:06 +0300 |
| commit | cb1b0744930801b6e06d05f788c3e7cb40163167 (patch) | |
| tree | 63a75980502a04da25836213653a4f0dc2cfe53f /src/nxt_unit.c | |
| parent | d54d806c52756ab65d61713589029627ffa72c5d (diff) | |
| download | unit-cb1b0744930801b6e06d05f788c3e7cb40163167.tar.gz unit-cb1b0744930801b6e06d05f788c3e7cb40163167.tar.bz2 | |
Making port fd blocking on app side and non-blocking in Unit.
This issue was introduced in libunit commit (e0f0cd7d244a). All port
sockets in application should be in blocking mode whereas Unit itself
operates non-blocking sockets.
Having non-blocking sockets in application may cause send error during
intensive response packets generation.
See https://mailman.nginx.org/pipermail/unit/2018-October/000080.html.
Diffstat (limited to 'src/nxt_unit.c')
| -rw-r--r-- | src/nxt_unit.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nxt_unit.c b/src/nxt_unit.c index 0f46dc7e..251c5219 100644 --- a/src/nxt_unit.c +++ b/src/nxt_unit.c @@ -510,7 +510,7 @@ int nxt_unit_process_msg(nxt_unit_ctx_t *ctx, nxt_unit_port_id_t *port_id, void *buf, size_t buf_size, void *oob, size_t oob_size) { - int fd, rc; + int fd, rc, nb; pid_t pid; nxt_queue_t incoming_buf; struct cmsghdr *cm; @@ -611,6 +611,15 @@ nxt_unit_process_msg(nxt_unit_ctx_t *ctx, nxt_unit_port_id_t *port_id, port_msg->stream, (int) new_port_msg->pid, (int) new_port_msg->id, fd); + nb = 0; + + if (nxt_slow_path(ioctl(fd, FIONBIO, &nb) == -1)) { + nxt_unit_alert(ctx, "#%"PRIu32": new_port: ioctl(%d, FIONBIO, 0) " + "failed: %s (%d)", fd, strerror(errno), errno); + + goto fail; + } + nxt_unit_port_id_init(&new_port.id, new_port_msg->pid, new_port_msg->id); |