diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
commit | c2068d08f097383b8eac508117e6d405627e6cef (patch) | |
tree | 06ca21df58481e97289a566f42703102c0b6583c /src/event/modules/ngx_aio_module.c | |
parent | 8743f92a1acd46c0a4b0df2bf6a80fc1b110affb (diff) | |
download | nginx-c2068d08f097383b8eac508117e6d405627e6cef.tar.gz nginx-c2068d08f097383b8eac508117e6d405627e6cef.zip |
nginx-0.3.3-RELEASE importrelease-0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
Diffstat (limited to 'src/event/modules/ngx_aio_module.c')
-rw-r--r-- | src/event/modules/ngx_aio_module.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/event/modules/ngx_aio_module.c b/src/event/modules/ngx_aio_module.c index bf78a8e00..fb3c8c85e 100644 --- a/src/event/modules/ngx_aio_module.c +++ b/src/event/modules/ngx_aio_module.c @@ -14,12 +14,13 @@ #endif -static ngx_int_t ngx_aio_init(ngx_cycle_t *cycle); +static ngx_int_t ngx_aio_init(ngx_cycle_t *cycle, ngx_msec_t timer); static void ngx_aio_done(ngx_cycle_t *cycle); static ngx_int_t ngx_aio_add_event(ngx_event_t *ev, int event, u_int flags); static ngx_int_t ngx_aio_del_event(ngx_event_t *ev, int event, u_int flags); static ngx_int_t ngx_aio_del_connection(ngx_connection_t *c, u_int flags); -static ngx_int_t ngx_aio_process_events(ngx_cycle_t *cycle); +static ngx_int_t ngx_aio_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, + ngx_uint_t flags); ngx_os_io_t ngx_os_aio = { @@ -73,9 +74,9 @@ ngx_module_t ngx_aio_module = { #if (NGX_HAVE_KQUEUE) static ngx_int_t -ngx_aio_init(ngx_cycle_t *cycle) +ngx_aio_init(ngx_cycle_t *cycle, ngx_msec_t timer) { - if (ngx_kqueue_module_ctx.actions.init(cycle) == NGX_ERROR) { + if (ngx_kqueue_module_ctx.actions.init(cycle, timer) == NGX_ERROR) { return NGX_ERROR; } @@ -159,9 +160,9 @@ ngx_aio_del_connection(ngx_connection_t *c, u_int flags) static ngx_int_t -ngx_aio_process_events(ngx_cycle_t *cycle) +ngx_aio_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) { - return ngx_kqueue_module_ctx.actions.process_events(cycle); + return ngx_kqueue_module_ctx.actions.process_events(cycle, timer, flags); } #endif /* NGX_HAVE_KQUEUE */ |