comparison src/event/modules/ngx_win32_select_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
80 FD_ZERO(&master_read_fd_set); 80 FD_ZERO(&master_read_fd_set);
81 FD_ZERO(&master_write_fd_set); 81 FD_ZERO(&master_write_fd_set);
82 nevents = 0; 82 nevents = 0;
83 } 83 }
84 84
85 if (ngx_process == NGX_PROCESS_WORKER 85 if (ngx_process >= NGX_PROCESS_WORKER
86 || cycle->old_cycle == NULL 86 || cycle->old_cycle == NULL
87 || cycle->old_cycle->connection_n < cycle->connection_n) 87 || cycle->old_cycle->connection_n < cycle->connection_n)
88 { 88 {
89 index = ngx_alloc(sizeof(ngx_event_t *) * 2 * cycle->connection_n, 89 index = ngx_alloc(sizeof(ngx_event_t *) * 2 * cycle->connection_n,
90 cycle->log); 90 cycle->log);