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_h1proto.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 '')
-rw-r--r-- | src/nxt_h1proto.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c index b5b5d6e6..07e3c7bc 100644 --- a/src/nxt_h1proto.c +++ b/src/nxt_h1proto.c @@ -1220,6 +1220,7 @@ nxt_h1p_conn_request_timeout(nxt_task_t *task, void *obj, void *data) nxt_debug(task, "h1p conn request timeout"); c = nxt_read_timer_conn(timer); + c->block_read = 1; /* * Disable SO_LINGER off during socket closing * to send "408 Request Timeout" error response. @@ -1250,6 +1251,7 @@ nxt_h1p_conn_request_send_timeout(nxt_task_t *task, void *obj, void *data) nxt_debug(task, "h1p conn request send timeout"); c = nxt_write_timer_conn(timer); + c->block_write = 1; h1p = c->socket.data; nxt_h1p_request_error(task, h1p, h1p->request); @@ -1464,6 +1466,7 @@ nxt_h1p_idle_timeout(nxt_task_t *task, void *obj, void *data) nxt_debug(task, "h1p idle timeout"); c = nxt_read_timer_conn(timer); + c->block_read = 1; nxt_h1p_idle_response(task, c); } @@ -1559,6 +1562,7 @@ nxt_h1p_idle_response_timeout(nxt_task_t *task, void *obj, void *data) nxt_debug(task, "h1p idle timeout response timeout"); c = nxt_read_timer_conn(timer); + c->block_write = 1; nxt_h1p_shutdown(task, c); } |