Mercurial > hg > nginx-quic
changeset 4319:f40541f7afb5
Fixed AIO on Linux, broken in r4306.
Events from eventfd do not have c->write set, and the stale event
check added in r4306 causes null pointer dereference.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 29 Nov 2011 17:27:13 +0000 |
parents | f85bd7c35c77 |
children | b72828fe457f |
files | src/event/modules/ngx_epoll_module.c |
diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -681,19 +681,19 @@ ngx_epoll_process_events(ngx_cycle_t *cy wev = c->write; - if (c->fd == -1 || wev->instance != instance) { + if ((revents & EPOLLOUT) && wev->active) { - /* - * the stale event from a file descriptor - * that was just closed in this iteration - */ + if (c->fd == -1 || wev->instance != instance) { - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, - "epoll: stale event %p", c); - continue; - } + /* + * the stale event from a file descriptor + * that was just closed in this iteration + */ - if ((revents & EPOLLOUT) && wev->active) { + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, + "epoll: stale event %p", c); + continue; + } if (flags & NGX_POST_THREAD_EVENTS) { wev->posted_ready = 1;