diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-08-10 13:07:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-08-10 13:07:15 +0000 |
| commit | 07b280a29f425d0da024cc9ab2987dd23f792386 (patch) | |
| tree | dc0f73eb7170adffac983750c1cefc081a706783 /src/os/win32 | |
| parent | fe8726404cff0d057348e98f24528609db37bd18 (diff) | |
| download | nginx-07b280a29f425d0da024cc9ab2987dd23f792386.tar.gz nginx-07b280a29f425d0da024cc9ab2987dd23f792386.zip | |
introduce NGX_PROCESS_JUST_SPAWN and change field name accordingly
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_process.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_process.h | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c index e7c283612..e57adb484 100644 --- a/src/os/win32/ngx_process.c +++ b/src/os/win32/ngx_process.c @@ -163,11 +163,11 @@ ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn) switch (respawn) { case NGX_PROCESS_RESPAWN: - ngx_processes[s].just_respawn = 0; + ngx_processes[s].just_spawn = 0; break; case NGX_PROCESS_JUST_RESPAWN: - ngx_processes[s].just_respawn = 1; + ngx_processes[s].just_spawn = 1; break; } diff --git a/src/os/win32/ngx_process.h b/src/os/win32/ngx_process.h index 520a55bb2..edcde3918 100644 --- a/src/os/win32/ngx_process.h +++ b/src/os/win32/ngx_process.h @@ -33,7 +33,7 @@ typedef struct { u_char quit_event[NGX_PROCESS_SYNC_NAME]; u_char reopen_event[NGX_PROCESS_SYNC_NAME]; - unsigned just_respawn:1; + unsigned just_spawn:1; unsigned exiting:1; } ngx_process_t; diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 12b13d17e..58ac74299 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -440,10 +440,10 @@ ngx_quit_worker_processes(ngx_cycle_t *cycle, ngx_uint_t old) ngx_processes[n].pid, ngx_processes[n].handle, ngx_processes[n].exiting, - ngx_processes[n].just_respawn); + ngx_processes[n].just_spawn); - if (old && ngx_processes[n].just_respawn) { - ngx_processes[n].just_respawn = 0; + if (old && ngx_processes[n].just_spawn) { + ngx_processes[n].just_spawn = 0; continue; } @@ -550,7 +550,7 @@ found: ngx_processes[n].pid, ngx_processes[n].handle, ngx_processes[n].exiting, - ngx_processes[n].just_respawn); + ngx_processes[n].just_spawn); if (ngx_processes[n].handle) { return 1; |