diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-11-15 12:26:51 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2005-11-15 12:26:51 +0000 |
| commit | fb0f94f09b096175f30ac00f514114ce3cb9b47b (patch) | |
| tree | 8cb1a064e139b5db9afe9262cc81fa49cd1bb8f6 /src/event/modules | |
| parent | 3f1a03007279c07d1cfa8bc658d36059b13f66d2 (diff) | |
| download | nginx-fb0f94f09b096175f30ac00f514114ce3cb9b47b.tar.gz | |
Changes with nginx 0.3.10 15 Nov 2005v0.3.10
*) Change: the "valid_referers" directive and the "$invalid_referer"
variable was moved to the new ngx_http_referer_module from the
ngx_http_rewrite_module.
*) Change: the "$apache_bytes_sent" variable name was changed to
"$body_bytes_sent".
*) Feature: the "$sent_http_..." variables.
*) Feature: the "if" directive supports the "=" and "!=" operations.
*) Feature: the "proxy_set_body" directive supports the HTTPS protocol.
*) Feature: the "proxy_set_body" directive.
*) Feature: the "post_action" directive.
*) Feature: the ngx_http_empty_gif_module.
*) Feature: the "worker_cpu_affinity" directive for Linux.
*) Bugfix: the "rewrite" directive did not unescape URI part in
redirect, now it is unescaped except the %00-%25 and %7F-%FF
characters.
*) Bugfix: nginx could not be built by the icc 9.0 compiler.
*) Bugfix: if the SSI was enabled for zero size static file, then the
chunked response was encoded incorrectly.
Diffstat (limited to 'src/event/modules')
| -rw-r--r-- | src/event/modules/ngx_devpoll_module.c | 8 | ||||
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 8 | ||||
| -rw-r--r-- | src/event/modules/ngx_poll_module.c | 8 | ||||
| -rw-r--r-- | src/event/modules/ngx_rtsig_module.c | 4 | ||||
| -rw-r--r-- | src/event/modules/ngx_select_module.c | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c index 7238e5bcb..b149bfedd 100644 --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -374,10 +374,10 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_event_timer_alarm = 0; return NGX_OK; } - + level = NGX_LOG_INFO; - - } else { + + } else { level = NGX_LOG_ALERT; } @@ -434,7 +434,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, /* * if the error events were returned without POLLIN or POLLOUT, * then add these flags to handle the events at least in one - * active handler + * active handler */ revents |= POLLIN|POLLOUT; diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index 7364d7d00..d866ffd48 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -418,10 +418,10 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_event_timer_alarm = 0; return NGX_OK; } - + level = NGX_LOG_INFO; - - } else { + + } else { level = NGX_LOG_ALERT; } @@ -471,7 +471,7 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, "epoll: fd:%d ev:%04XD d:%p", - c->fd, revents, event_list[i].data); + c->fd, revents, event_list[i].data.ptr); if (revents & (EPOLLERR|EPOLLHUP)) { ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c index ffd6ace8a..cb9c90d20 100644 --- a/src/event/modules/ngx_poll_module.c +++ b/src/event/modules/ngx_poll_module.c @@ -280,10 +280,10 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_event_timer_alarm = 0; return NGX_OK; } - + level = NGX_LOG_INFO; - - } else { + + } else { level = NGX_LOG_ALERT; } @@ -388,7 +388,7 @@ ngx_poll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) queue = (ngx_event_t **) (ev->accept ? &ngx_posted_accept_events: &ngx_posted_events); - ngx_locked_post_event(ev, queue); + ngx_locked_post_event(ev, queue); } if (revents & POLLOUT) { diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c index a3891e8d4..603cd883f 100644 --- a/src/event/modules/ngx_rtsig_module.c +++ b/src/event/modules/ngx_rtsig_module.c @@ -327,7 +327,7 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) if (timer != NGX_TIMER_INFINITE) { return NGX_AGAIN; } - + ngx_log_error(NGX_LOG_ALERT, cycle->log, err, "sigtimedwait() returned EAGAIN without timeout"); return NGX_ERROR; @@ -390,7 +390,7 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_locked_post_event(rev, queue); - } else { + } else { rev->handler(rev); } } diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index 57f6f0500..feceb9878 100644 --- a/src/event/modules/ngx_select_module.c +++ b/src/event/modules/ngx_select_module.c @@ -353,10 +353,10 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_event_timer_alarm = 0; return NGX_OK; } - + level = NGX_LOG_INFO; - - } else { + + } else { level = NGX_LOG_ALERT; } @@ -405,7 +405,7 @@ ngx_select_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, queue = (ngx_event_t **) (ev->accept ? &ngx_posted_accept_events: &ngx_posted_events); - ngx_locked_post_event(ev, queue); + ngx_locked_post_event(ev, queue); nready++; } |
