diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-30 23:34:51 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-30 23:34:51 +0300 |
| commit | dd98809befadeda443a0e25da70c3020e613481e (patch) | |
| tree | 9a21777e29904ad66ddb5b852d55036aff15476b /src/event | |
| parent | 7d1cf8ffb442727bc8e54630dd565c8139cead67 (diff) | |
| parent | 7b053dd1b20237622f89148e6c01a43927a4572a (diff) | |
| download | nginx-dd98809befadeda443a0e25da70c3020e613481e.tar.gz nginx-dd98809befadeda443a0e25da70c3020e613481e.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_eventport_module.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c index f67c70457..d304e1c91 100644 --- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -399,7 +399,7 @@ ngx_eventport_del_event(ngx_event_t *ev, ngx_int_t event, ngx_uint_t flags) return NGX_ERROR; } - } else { + } else if (ev->active) { ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, "eventport del event: fd:%d", c->fd); diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index f2f79d76c..a59a4c9b5 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -257,9 +257,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) ngx_shmtx_unlock(&ngx_accept_mutex); } - if (delta) { - ngx_event_expire_timers(); - } + ngx_event_expire_timers(); ngx_event_process_posted(cycle, &ngx_posted_events); } |