From bb87fa11ca65d1263a32f86d51d1daa89dc11544 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 30 Jan 2017 16:47:50 +0300 Subject: nxt_event_timer has been renamed to nxt_timer. --- src/nxt_event_conn_read.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nxt_event_conn_read.c') diff --git a/src/nxt_event_conn_read.c b/src/nxt_event_conn_read.c index 93a17ddc..81fffd3c 100644 --- a/src/nxt_event_conn_read.c +++ b/src/nxt_event_conn_read.c @@ -86,7 +86,7 @@ nxt_event_conn_io_read(nxt_task_t *task, void *obj, void *data) if (n != NXT_AGAIN) { nxt_event_fd_block_read(engine, &c->socket); - nxt_event_timer_disable(&c->read_timer); + nxt_timer_disable(&c->read_timer); if (n == 0) { handler = state->close_handler; @@ -107,7 +107,7 @@ nxt_event_conn_io_read(nxt_task_t *task, void *obj, void *data) c->socket.read_handler = c->io->read; c->socket.error_handler = state->error_handler; - if (c->read_timer.state == NXT_EVENT_TIMER_DISABLED + if (c->read_timer.state == NXT_TIMER_DISABLED || nxt_event_fd_is_disabled(c->socket.read)) { /* Timer may be set or reset. */ @@ -125,7 +125,7 @@ ready: nxt_event_fd_block_read(engine, &c->socket); if (state->autoreset_timer) { - nxt_event_timer_disable(&c->read_timer); + nxt_timer_disable(&c->read_timer); } handler = state->ready_handler; -- cgit