Mercurial > hg > nginx-ranges
comparison src/event/modules/ngx_poll_module.c @ 578:f3a9e57d2e17
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 11 Mar 2010 21:27:17 +0300 |
parents | 43e02819c5cf |
children | be4f34123024 |
comparison
equal
deleted
inserted
replaced
539:5f4de8cf0d9d | 578:f3a9e57d2e17 |
---|---|
70 | 70 |
71 if (event_list == NULL) { | 71 if (event_list == NULL) { |
72 nevents = 0; | 72 nevents = 0; |
73 } | 73 } |
74 | 74 |
75 if (ngx_process == NGX_PROCESS_WORKER | 75 if (ngx_process >= NGX_PROCESS_WORKER |
76 || cycle->old_cycle == NULL | 76 || cycle->old_cycle == NULL |
77 || cycle->old_cycle->connection_n < cycle->connection_n) | 77 || cycle->old_cycle->connection_n < cycle->connection_n) |
78 { | 78 { |
79 list = ngx_alloc(sizeof(struct pollfd) * cycle->connection_n, | 79 list = ngx_alloc(sizeof(struct pollfd) * cycle->connection_n, |
80 cycle->log); | 80 cycle->log); |