Mercurial > hg > nginx

changeset 2803:60758ab4e5f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Igor Sysoev <igor@sysoev.ru>
date Tue, 05 May 2009 13:16:29 +0000
parents 44b2081c015a
children edc0cd9db5cf
files src/core/ngx_connection.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -202,8 +202,6 @@ ngx_open_listening_sockets(ngx_cycle_t *
                 continue;
             }
 
-            ls[i].log = *ls[i].logp;
-
             if (ls[i].inherited) {
 
                 /* TODO: close on exit */
@@ -357,6 +355,8 @@ ngx_configure_listening_sockets(ngx_cycl
     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))