Mercurial > hg > nginx
comparison src/core/nginx.c @ 4361:6bfae7032017 stable-1.0
Merge of r4294:
Fixed handling of SIGWINCH/NOACCEPT signal.
After first upgrade it was ignored since r4020 (1.1.1, 1.0.9) as
ngx_daemonized wasn't set.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 14 Dec 2011 15:25:32 +0000 |
parents | 7447784028a7 |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4360:7447784028a7 | 4361:6bfae7032017 |
---|---|
374 } | 374 } |
375 | 375 |
376 ngx_daemonized = 1; | 376 ngx_daemonized = 1; |
377 } | 377 } |
378 | 378 |
379 if (ngx_inherited) { | |
380 ngx_daemonized = 1; | |
381 } | |
382 | |
379 #endif | 383 #endif |
380 | 384 |
381 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { | 385 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { |
382 return 1; | 386 return 1; |
383 } | 387 } |