# HG changeset patch # User Igor Sysoev # Date 1241529389 0 # Node ID 60758ab4e5f46a2a47804352da09c9f3992c2a07 # Parent 44b2081c015a39b1255549c164b47f7bc19052d9 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 --- 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))