diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-08-28 13:21:12 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-08-28 13:21:12 +0000 |
| commit | 802fd20929172c84d0fae425d432cb4113b61708 (patch) | |
| tree | a1c12524eedc78161bfdd88994911ee06a7b0731 /src/event/modules/ngx_poll_module.c | |
| parent | 0761e54cdc650d741c4ed56e008ea15e1147733f (diff) | |
| download | nginx-802fd20929172c84d0fae425d432cb4113b61708.tar.gz | |
Changes with nginx 0.8.11 28 Aug 2009v0.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.
Diffstat (limited to 'src/event/modules/ngx_poll_module.c')
| -rw-r--r-- | src/event/modules/ngx_poll_module.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index db9c41945..e45942b91 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -260,11 +260,7 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ready = poll(event_list, (u_int) nevents, (int) timer); - if (ready == -1) { - err = ngx_errno; - } else { - err = 0; - } + err = (ready == -1) ? ngx_errno : 0; if (flags & NGX_UPDATE_TIME) { ngx_time_update(0, 0); |