Mercurial > hg > nginx-mail
comparison src/event/modules/ngx_win32_select_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | be4f34123024 |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
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); |
267 } | 267 } |
268 | 268 |
269 err = (ready == -1) ? ngx_socket_errno : 0; | 269 err = (ready == -1) ? ngx_socket_errno : 0; |
270 | 270 |
271 if (flags & NGX_UPDATE_TIME) { | 271 if (flags & NGX_UPDATE_TIME) { |
272 ngx_time_update(0, 0); | 272 ngx_time_update(); |
273 } | 273 } |
274 | 274 |
275 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, | 275 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, |
276 "select ready %d", ready); | 276 "select ready %d", ready); |
277 | 277 |