Mercurial > hg > nginx-ranges
diff src/event/ngx_event.h @ 236:c982febb7588 NGINX_0_4_3
nginx 0.4.3
*) Change: now the 499 error could not be redirected using an
"error_page" directive.
*) Feature: the Solaris 10 event ports support.
*) Feature: the ngx_http_browser_module.
*) Bugfix: a segmentation fault may occur while redirecting the 400
error to the proxied server using an "proxy_pass" directive.
*) Bugfix: a segmentation fault occurred if an unix domain socket was
used in an "proxy_pass" directive; bug appeared in 0.3.47.
*) Bugfix: SSI did work with memcached and nonbuffered responses.
*) Workaround: of the Sun Studio PAUSE hardware capability bug.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 26 Sep 2006 00:00:00 +0400 |
parents | 0ad9eeb6ac7f |
children | f7cd062ee035 |
line wrap: on
line diff
--- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -41,8 +41,6 @@ struct ngx_event_s { unsigned accept:1; - unsigned oneshot:1; - /* used to detect the stale events in kqueue, rt signals and epoll */ unsigned instance:1; @@ -57,6 +55,8 @@ struct ngx_event_s { /* the ready event; in aio mode 0 means that no operation can be posted */ unsigned ready:1; + unsigned oneshot:1; + /* aio operation is complete */ unsigned complete:1; @@ -224,7 +224,7 @@ extern ngx_event_actions_t ngx_event_a /* * The event filter is deleted after a notification without an additional - * syscall: kqueue, epoll, Solaris 10's event ports. + * syscall: kqueue, epoll. */ #define NGX_USE_ONESHOT_EVENT 0x00000002 @@ -286,14 +286,17 @@ extern ngx_event_actions_t ngx_event_a */ #define NGX_USE_TIMER_EVENT 0x00000800 +/* + * All event filters on file descriptor are deleted after a notification: + * Solaris 10's event ports. + */ +#define NGX_USE_EVENTPORT_EVENT 0x00001000 + /* * The event filter is deleted before the closing file. - * Has no meaning for select, poll, epoll. - * - * kqueue: kqueue deletes event filters for file that closed - * so we need only to delete filters in user-level batch array + * Has no meaning for select, poll, kqueue, epoll. * /dev/poll: we need to flush POLLREMOVE event before closing file */ @@ -335,7 +338,7 @@ extern ngx_event_actions_t ngx_event_a #define NGX_DISABLE_EVENT EV_DISABLE -#elif (NGX_HAVE_DEVPOLL) +#elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT) #define NGX_READ_EVENT POLLIN #define NGX_WRITE_EVENT POLLOUT @@ -446,6 +449,7 @@ extern ngx_atomic_t *ngx_connec extern ngx_atomic_t *ngx_accept_mutex_ptr; extern ngx_shmtx_t ngx_accept_mutex; extern ngx_uint_t ngx_use_accept_mutex; +extern ngx_uint_t ngx_accept_events; extern ngx_uint_t ngx_accept_mutex_held; extern ngx_msec_t ngx_accept_mutex_delay; extern ngx_int_t ngx_accept_disabled;