From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 10 Dec 2012 17:46:51 +0000 (+0000)
Subject: Merge of r4918: cache manager startup with many listen sockets.
X-Git-Tag: release-1.2.6~5
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=e3cf44789f2a6e256a596f187c6d4211859f1d73;p=nginx.git

Merge of r4918: cache manager startup with many listen sockets.

Fixed failure to start cache manager and cache loader processes
if there were more than 512 listening sockets in configuration.
---

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index ba1b3f9e2..3ba5e7682 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -749,6 +749,8 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle)
 
         ls[i].fd = (ngx_socket_t) -1;
     }
+
+    cycle->listening.nelts = 0;
 }
 
 
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index acafb7f6f..c9b0266ed 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -1296,14 +1296,19 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
     void         *ident[4];
     ngx_event_t   ev;
 
-    cycle->connection_n = 512;
-
+    /*
+     * Set correct process type since closing listening Unix domain socket
+     * in a master process also removes the Unix domain socket file.
+     */
     ngx_process = NGX_PROCESS_HELPER;
 
-    ngx_worker_process_init(cycle, -1);
-
     ngx_close_listening_sockets(cycle);
 
+    /* Set a moderate number of connections for a helper process. */
+    cycle->connection_n = 512;
+
+    ngx_worker_process_init(cycle, -1);
+
     ngx_memzero(&ev, sizeof(ngx_event_t));
     ev.handler = ctx->handler;
     ev.data = ident;