Mercurial > hg > nginx
comparison src/os/unix/ngx_process.c @ 3247:1f3cd08ebb82 stable-0.7
merge r3017, r3018, r3019, r3020, r3021, r3022, r3023, r3196:
cache management fixes:
*) separate cache loader process
*) use real file cache length, this fixes cache size counting for responses
without "Content-Length" header and 304 responses.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 26 Oct 2009 17:23:49 +0000 |
parents | 4b5cf483c6a8 |
children | e1409e56ba7c |
comparison
equal
deleted
inserted
replaced
3246:eb555a9a57d4 | 3247:1f3cd08ebb82 |
---|---|
212 ngx_processes[s].name = name; | 212 ngx_processes[s].name = name; |
213 ngx_processes[s].exiting = 0; | 213 ngx_processes[s].exiting = 0; |
214 | 214 |
215 switch (respawn) { | 215 switch (respawn) { |
216 | 216 |
217 case NGX_PROCESS_NORESPAWN: | |
218 ngx_processes[s].respawn = 0; | |
219 ngx_processes[s].just_spawn = 0; | |
220 ngx_processes[s].detached = 0; | |
221 break; | |
222 | |
223 case NGX_PROCESS_JUST_SPAWN: | |
224 ngx_processes[s].respawn = 0; | |
225 ngx_processes[s].just_spawn = 1; | |
226 ngx_processes[s].detached = 0; | |
227 break; | |
228 | |
217 case NGX_PROCESS_RESPAWN: | 229 case NGX_PROCESS_RESPAWN: |
218 ngx_processes[s].respawn = 1; | 230 ngx_processes[s].respawn = 1; |
219 ngx_processes[s].just_respawn = 0; | 231 ngx_processes[s].just_spawn = 0; |
220 ngx_processes[s].detached = 0; | 232 ngx_processes[s].detached = 0; |
221 break; | 233 break; |
222 | 234 |
223 case NGX_PROCESS_JUST_RESPAWN: | 235 case NGX_PROCESS_JUST_RESPAWN: |
224 ngx_processes[s].respawn = 1; | 236 ngx_processes[s].respawn = 1; |
225 ngx_processes[s].just_respawn = 1; | 237 ngx_processes[s].just_spawn = 1; |
226 ngx_processes[s].detached = 0; | 238 ngx_processes[s].detached = 0; |
227 break; | 239 break; |
228 | 240 |
229 case NGX_PROCESS_DETACHED: | 241 case NGX_PROCESS_DETACHED: |
230 ngx_processes[s].respawn = 0; | 242 ngx_processes[s].respawn = 0; |
231 ngx_processes[s].just_respawn = 0; | 243 ngx_processes[s].just_spawn = 0; |
232 ngx_processes[s].detached = 1; | 244 ngx_processes[s].detached = 1; |
233 break; | 245 break; |
234 } | 246 } |
235 | 247 |
236 if (s == ngx_last_process) { | 248 if (s == ngx_last_process) { |