From c6aebf6c7411c5d43bd63cf61db08a1ec914dc5c Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Fri, 12 Apr 2013 15:04:23 +0000 Subject: Events: handle only active events in eventport. We generate both read and write events if an error event was returned by port_getn() without POLLIN/POLLOUT, but we should not try to handle inactive events, they may even have no handler. --- src/event/modules/ngx_eventport_module.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c index 5f9cf4e35..860f5985c 100644 --- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -530,6 +530,14 @@ ngx_eventport_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, rev = c->read; wev = c->write; + if (!rev->active) { + revents &= ~POLLIN; + } + + if (!wew->active) { + revents &= ~POLLOUT; + } + rev->active = 0; wev->active = 0; -- cgit