diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-05-05 13:16:29 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-05-05 13:16:29 +0000 |
| commit | d4a71fb8441c3c2e8ccecc18391ff97c0a3cde57 (patch) | |
| tree | 9bb05cc6598875e159ccddeef45223f5192b0ffc /src/core/ngx_connection.c | |
| parent | 00bd137064114d5d5c8023efeeafdc18056a7c78 (diff) | |
| download | nginx-d4a71fb8441c3c2e8ccecc18391ff97c0a3cde57.tar.gz nginx-d4a71fb8441c3c2e8ccecc18391ff97c0a3cde57.zip | |
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
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |