Mercurial > hg > nginx-vendor-current

comparison src/event/modules/ngx_poll_module.c @ 518:86dad910eeb6 NGINX_0_8_11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.8.11 *) Change: directive "gzip_disable msie6" enables gzipping for MSIE 6.0 SV1. *) Feature: file AIO support on FreeBSD and Linux. *) Feature: the "directio_alignment" directive.
author Igor Sysoev <http://sysoev.ru>
date Fri, 28 Aug 2009 00:00:00 +0400
parents f7cd062ee035
children 43e02819c5cf
comparison
equal deleted inserted replaced
517:15b5cddc5190 518:86dad910eeb6
258 258
259 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "poll timer: %M", timer); 259 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "poll timer: %M", timer);
260 260
261 ready = poll(event_list, (u_int) nevents, (int) timer); 261 ready = poll(event_list, (u_int) nevents, (int) timer);
262 262
263 if (ready == -1) { 263 err = (ready == -1) ? ngx_errno : 0;
264 err = ngx_errno;
265 } else {
266 err = 0;
267 }
268 264
269 if (flags & NGX_UPDATE_TIME) { 265 if (flags & NGX_UPDATE_TIME) {
270 ngx_time_update(0, 0); 266 ngx_time_update(0, 0);
271 } 267 }
272 268