summaryrefslogtreecommitdiffhomepage
path: root/src/event/modules/ngx_rtsig_module.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-09-23 11:02:22 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-09-23 11:02:22 +0000
commit31eb8c015d58a5b36b9578d4ee6c217e16cb776f (patch)
tree28ebccc10deba4132e05414aac1874d5013fdf58 /src/event/modules/ngx_rtsig_module.c
parentf44a1f5f579e19441db2d477a7c81d8894ba2262 (diff)
downloadnginx-release-0.2.0.tar.gz
nginx-release-0.2.0.tar.bz2
nginx-0.2.0-RELEASE importrelease-0.2.0
*) The pid-file names used during online upgrade was changed and now is not required a manual rename operation. The old master process adds the ".oldbin" suffix to its pid-file and executes a new binary file. The new master process creates usual pid-file without the ".newbin" suffix. If the master process exits, then old master process renames back its pid-file with the ".oldbin" suffix to the pid-file without suffix. *) Change: the "worker_connections" directive, new name of the "connections" directive; now the directive specifies maximum number of connections, but not maximum socket descriptor number. *) Feature: SSL supports the session cache inside one worker process. *) Feature: the "satisfy_any" directive. *) Change: the ngx_http_access_module and ngx_http_auth_basic_module do not run for subrequests. *) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending" directives. *) Bugfix: if all backend using in load-balancing failed after one error, then nginx did not try do connect to them during 60 seconds. *) Bugfix: in IMAP/POP3 command argument parsing. Thanks to Rob Mueller. *) Bugfix: errors while using SSL in IMAP/POP3 proxy. *) Bugfix: errors while using SSI and gzipping. *) Bugfix: the "Expires" and "Cache-Control" header lines were omitted from the 304 responses. Thanks to Alexandr Kukushkin.
Diffstat (limited to '')
-rw-r--r--src/event/modules/ngx_rtsig_module.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 69792c67c..92e33a013 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -165,7 +165,9 @@ ngx_rtsig_init(ngx_cycle_t *cycle)
ngx_event_actions = ngx_rtsig_module_ctx.actions;
- ngx_event_flags = NGX_USE_RTSIG_EVENT|NGX_USE_GREEDY_EVENT;
+ ngx_event_flags = NGX_USE_RTSIG_EVENT
+ |NGX_USE_GREEDY_EVENT
+ |NGX_USE_FD_EVENT;
return NGX_OK;
}
@@ -428,7 +430,7 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle)
/* TODO: old_cycles */
- c = &ngx_cycle->connections[si.si_fd];
+ c = ngx_cycle->files[si.si_fd];
instance = signo - rtscf->signo;
@@ -596,7 +598,7 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
break;
}
- c = &cycle->connections[overflow_current++];
+ c = cycle->files[overflow_current++];
if (c->fd == -1) {
continue;
@@ -652,7 +654,7 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
}
for (i = 0; i < n; i++) {
- c = &cycle->connections[overflow_list[i].fd];
+ c = cycle->files[overflow_list[i].fd];
rev = c->read;