From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 8 Jan 2008 11:31:50 +0000 (+0000)
Subject: workaround for Linux 2.6 OpenVZ
X-Git-Tag: release-0.6.25~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=0008ebe2a381574ded201e5527c1b0f73b6e2b7a;p=nginx.git

workaround for Linux 2.6 OpenVZ
---

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index af2f25cd8..e0a6ba23a 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -537,13 +537,21 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle)
 
         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 (c->read->active) {
+            } else if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
+
+                /*
+                 * 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);
             }
         }