Mercurial > hg > nginx
comparison src/os/win32/ngx_process_cycle.c @ 4902:db9ce6fc9482 stable-1.2
Merge of r4870, r4871, r4890, r4895: minor fixes.
*) Made sure to initialize the entire ngx_file_t structure.
Found by Coverity.
*) Correct plural form for "path" in the whole source base.
*) Removed conditional compilation from waitpid() error test.
There are reports that call to a signal handler for an exited process
despite waitpid() already called for the process may happen on Linux
as well.
*) Style, parentheses instead of braces in misc/GNUMakefile.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 12 Nov 2012 18:39:51 +0000 |
parents | d620f497c50f |
children | 3d2d3e1cf427 |
comparison
equal
deleted
inserted
replaced
4901:a0cb7fc23cc2 | 4902:db9ce6fc9482 |
---|---|
961 ngx_uint_t i; | 961 ngx_uint_t i; |
962 ngx_path_t **path; | 962 ngx_path_t **path; |
963 | 963 |
964 next = 60 * 60; | 964 next = 60 * 60; |
965 | 965 |
966 path = ngx_cycle->pathes.elts; | 966 path = ngx_cycle->paths.elts; |
967 for (i = 0; i < ngx_cycle->pathes.nelts; i++) { | 967 for (i = 0; i < ngx_cycle->paths.nelts; i++) { |
968 | 968 |
969 if (path[i]->manager) { | 969 if (path[i]->manager) { |
970 n = path[i]->manager(path[i]->data); | 970 n = path[i]->manager(path[i]->data); |
971 | 971 |
972 next = (n <= next) ? n : next; | 972 next = (n <= next) ? n : next; |
1000 | 1000 |
1001 ngx_msleep(60000); | 1001 ngx_msleep(60000); |
1002 | 1002 |
1003 cycle = (ngx_cycle_t *) ngx_cycle; | 1003 cycle = (ngx_cycle_t *) ngx_cycle; |
1004 | 1004 |
1005 path = cycle->pathes.elts; | 1005 path = cycle->paths.elts; |
1006 for (i = 0; i < cycle->pathes.nelts; i++) { | 1006 for (i = 0; i < cycle->paths.nelts; i++) { |
1007 | 1007 |
1008 if (ngx_terminate || ngx_quit) { | 1008 if (ngx_terminate || ngx_quit) { |
1009 break; | 1009 break; |
1010 } | 1010 } |
1011 | 1011 |