diff options
author | Igor Sysoev <igor@sysoev.ru> | 2019-02-28 18:04:11 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2019-02-28 18:04:11 +0300 |
commit | 834e8ca576868c5ecd104bd5ebec9968c7f80a0b (patch) | |
tree | 1574f2532ffd849666e78b6a68fc7a03cfa1eb34 /src/nxt_conn_read.c | |
parent | afda14d1f23cc49eee5939c25278eec3501d8631 (diff) | |
download | unit-834e8ca576868c5ecd104bd5ebec9968c7f80a0b.tar.gz unit-834e8ca576868c5ecd104bd5ebec9968c7f80a0b.tar.bz2 |
Fixed timer and event race condition.
When idle timeout occurs at the same time as a request comes in,
the timer handler closes connection while the read event triggers
request processing, and this eventually leads to segmentation fault.
Diffstat (limited to 'src/nxt_conn_read.c')
-rw-r--r-- | src/nxt_conn_read.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nxt_conn_read.c b/src/nxt_conn_read.c index 8228326b..83969b31 100644 --- a/src/nxt_conn_read.c +++ b/src/nxt_conn_read.c @@ -45,10 +45,11 @@ nxt_conn_io_read(nxt_task_t *task, void *obj, void *data) c = obj; - nxt_debug(task, "conn read fd:%d rdy:%d cl:%d", - c->socket.fd, c->socket.read_ready, c->socket.closed); + nxt_debug(task, "conn read fd:%d rdy:%d cl:%d er:%d bl:%d", + c->socket.fd, c->socket.read_ready, c->socket.closed, + c->socket.error, c->block_read); - if (c->socket.error != 0) { + if (c->socket.error != 0 || c->block_read) { return; } |