# HG changeset patch # User Igor Sysoev # Date 1199791910 0 # Node ID 86464f8eddd6f7709693d1c48e893b77c40248c7 # Parent 2547ef00c722973a6ceec8f66c70dd87573dfbca workaround for Linux 2.6 OpenVZ diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -537,13 +537,21 @@ ngx_close_listening_sockets(ngx_cycle_t c = ls[i].connection; - if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { - if (c->read->active) { + if (c->read->active) { + if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { ngx_del_conn(c, NGX_CLOSE_EVENT); - } + + } else if (ngx_event_flags & NGX_USE_EPOLL_EVENT) { - } else { - if (c->read->active) { + /* + * it seems that Linux-2.6.x OpenVZ sends events + * for closed shared listening sockets unless + * the events was explicity deleted + */ + + ngx_del_event(c->read, NGX_READ_EVENT, 0); + + } else { ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT); } }