diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-06-07 18:22:58 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-07 18:22:58 +0000 |
commit | 2d65078eff03defa7c852a72b48d89393dbd50d3 (patch) | |
tree | 6c334353af7dfa23b546f02851c2fa43bec2e7c6 /src | |
parent | 55192e74706f328a53db6173c50ba03af9582253 (diff) | |
download | nginx-2d65078eff03defa7c852a72b48d89393dbd50d3.tar.gz nginx-2d65078eff03defa7c852a72b48d89393dbd50d3.zip |
update r2925
Diffstat (limited to 'src')
-rw-r--r-- | src/core/ngx_connection.c | 2 | ||||
-rw-r--r-- | src/os/win32/ngx_process_cycle.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index d4bb0648a..0a7fe847d 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -603,6 +603,8 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle) ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno, ngx_close_socket_n " %V failed", &ls[i].addr_text); } + + ls[i].fd = (ngx_socket_t) -1; } } diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index a10dbfdf6..12b13d17e 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -208,6 +208,8 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) ngx_cycle = cycle; + ngx_close_listening_sockets(cycle); + if (ngx_start_worker_processes(cycle, NGX_PROCESS_JUST_RESPAWN)) { ngx_quit_worker_processes(cycle, 1); } |