From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 5 May 2009 13:16:29 +0000 (+0000)
Subject: move listen log copying from ngx_open_listening_sockets()
X-Git-Tag: release-0.7.55~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d4a71fb8441c3c2e8ccecc18391ff97c0a3cde57;p=nginx.git

move listen log copying from ngx_open_listening_sockets()
to ngx_configure_listening_sockets(), otherwise listen socket logs have no file
after first reload and this caused segfault if debug_connection was used;
the bug has been introduced in r2786
---

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index b843b866b..5dd1b7e23 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -202,8 +202,6 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
                 continue;
             }
 
-            ls[i].log = *ls[i].logp;
-
             if (ls[i].inherited) {
 
                 /* TODO: close on exit */
@@ -357,6 +355,8 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
     ls = cycle->listening.elts;
     for (i = 0; i < cycle->listening.nelts; i++) {
 
+        ls[i].log = *ls[i].logp;
+
         if (ls[i].rcvbuf != -1) {
             if (setsockopt(ls[i].fd, SOL_SOCKET, SO_RCVBUF,
                            (const void *) &ls[i].rcvbuf, sizeof(int))