2002-08-07 00:39:45 +08:00
|
|
|
|
2004-09-28 16:34:51 +08:00
|
|
|
/*
|
2004-09-30 00:00:49 +08:00
|
|
|
* Copyright (C) Igor Sysoev
|
2004-09-28 16:34:51 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2002-08-07 00:39:45 +08:00
|
|
|
#include <ngx_config.h>
|
2002-09-27 23:05:29 +08:00
|
|
|
#include <ngx_core.h>
|
2002-08-07 00:39:45 +08:00
|
|
|
#include <ngx_event.h>
|
|
|
|
|
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-07-04 23:10:33 +08:00
|
|
|
#define DEFAULT_CONNECTIONS 512
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-05-20 23:37:55 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
extern ngx_module_t ngx_kqueue_module;
|
2003-05-27 20:18:54 +08:00
|
|
|
extern ngx_module_t ngx_devpoll_module;
|
2004-02-12 01:08:49 +08:00
|
|
|
extern ngx_module_t ngx_epoll_module;
|
2004-06-11 02:36:57 +08:00
|
|
|
extern ngx_module_t ngx_rtsig_module;
|
2004-11-21 03:52:20 +08:00
|
|
|
extern ngx_module_t ngx_select_module;
|
2004-06-11 02:36:57 +08:00
|
|
|
|
2003-02-27 04:21:43 +08:00
|
|
|
|
2004-04-02 00:20:53 +08:00
|
|
|
static ngx_int_t ngx_event_module_init(ngx_cycle_t *cycle);
|
|
|
|
|
static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle);
|
2003-05-27 20:18:54 +08:00
|
|
|
static char *ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2003-12-09 23:08:11 +08:00
|
|
|
|
|
|
|
|
static char *ngx_event_connections(ngx_conf_t *cf, ngx_command_t *cmd,
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
void *conf);
|
2003-05-27 20:18:54 +08:00
|
|
|
static char *ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
|
2004-04-08 23:58:25 +08:00
|
|
|
static char *ngx_event_debug_connection(ngx_conf_t *cf, ngx_command_t *cmd,
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
void *conf);
|
2003-12-09 23:08:11 +08:00
|
|
|
|
2003-07-07 14:11:50 +08:00
|
|
|
static void *ngx_event_create_conf(ngx_cycle_t *cycle);
|
|
|
|
|
static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf);
|
2004-09-23 00:18:21 +08:00
|
|
|
static char *ngx_accept_mutex_check(ngx_conf_t *cf, void *post, void *data);
|
2003-05-16 23:27:48 +08:00
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
static ngx_uint_t ngx_timer_resolution;
|
|
|
|
|
sig_atomic_t ngx_event_timer_alarm;
|
|
|
|
|
|
2005-02-24 20:29:09 +08:00
|
|
|
static ngx_uint_t ngx_event_max_module;
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2005-02-24 20:29:09 +08:00
|
|
|
ngx_uint_t ngx_event_flags;
|
|
|
|
|
ngx_event_actions_t ngx_event_actions;
|
2004-04-02 00:20:53 +08:00
|
|
|
|
|
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
ngx_atomic_t connection_counter = 1;
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_atomic_t *ngx_connection_counter = &connection_counter;
|
2004-04-10 00:03:04 +08:00
|
|
|
|
|
|
|
|
|
2005-02-22 22:40:13 +08:00
|
|
|
ngx_atomic_t *ngx_accept_mutex_ptr;
|
|
|
|
|
ngx_atomic_t *ngx_accept_mutex;
|
2005-02-24 20:29:09 +08:00
|
|
|
ngx_uint_t ngx_accept_mutex_held;
|
|
|
|
|
ngx_msec_t ngx_accept_mutex_delay;
|
|
|
|
|
ngx_int_t ngx_accept_disabled;
|
2005-10-12 21:50:36 +08:00
|
|
|
ngx_file_t ngx_accept_mutex_lock_file;
|
2002-08-07 00:39:45 +08:00
|
|
|
|
|
|
|
|
|
2004-09-15 03:39:54 +08:00
|
|
|
#if (NGX_STAT_STUB)
|
|
|
|
|
|
|
|
|
|
ngx_atomic_t ngx_stat_accepted0;
|
|
|
|
|
ngx_atomic_t *ngx_stat_accepted = &ngx_stat_accepted0;
|
2005-02-24 20:29:09 +08:00
|
|
|
ngx_atomic_t ngx_stat_handled0;
|
|
|
|
|
ngx_atomic_t *ngx_stat_handled = &ngx_stat_handled0;
|
2004-09-15 03:39:54 +08:00
|
|
|
ngx_atomic_t ngx_stat_requests0;
|
|
|
|
|
ngx_atomic_t *ngx_stat_requests = &ngx_stat_requests0;
|
|
|
|
|
ngx_atomic_t ngx_stat_active0;
|
|
|
|
|
ngx_atomic_t *ngx_stat_active = &ngx_stat_active0;
|
|
|
|
|
ngx_atomic_t ngx_stat_reading0;
|
|
|
|
|
ngx_atomic_t *ngx_stat_reading = &ngx_stat_reading0;
|
|
|
|
|
ngx_atomic_t ngx_stat_writing0;
|
2005-02-24 20:29:09 +08:00
|
|
|
ngx_atomic_t *ngx_stat_writing = &ngx_stat_writing0;
|
2004-09-15 03:39:54 +08:00
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
|
|
|
|
|
static ngx_command_t ngx_events_commands[] = {
|
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
{ ngx_string("events"),
|
|
|
|
|
NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
|
|
|
|
|
ngx_events_block,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
NULL },
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_null_command
|
2003-05-16 23:27:48 +08:00
|
|
|
};
|
|
|
|
|
|
2004-04-13 00:38:09 +08:00
|
|
|
|
|
|
|
|
static ngx_core_module_t ngx_events_module_ctx = {
|
|
|
|
|
ngx_string("events"),
|
|
|
|
|
NULL,
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
|
|
|
|
|
ngx_module_t ngx_events_module = {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
NGX_MODULE_V1,
|
2004-04-13 00:38:09 +08:00
|
|
|
&ngx_events_module_ctx, /* module context */
|
2003-05-16 23:27:48 +08:00
|
|
|
ngx_events_commands, /* module directives */
|
2003-05-27 20:18:54 +08:00
|
|
|
NGX_CORE_MODULE, /* module type */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init master */
|
2003-07-04 23:10:33 +08:00
|
|
|
NULL, /* init module */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init process */
|
|
|
|
|
NULL, /* init thread */
|
|
|
|
|
NULL, /* exit thread */
|
|
|
|
|
NULL, /* exit process */
|
|
|
|
|
NULL, /* exit master */
|
|
|
|
|
NGX_MODULE_V1_PADDING
|
2003-05-16 23:27:48 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2003-07-01 23:00:03 +08:00
|
|
|
static ngx_str_t event_core_name = ngx_string("event_core");
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2004-09-23 00:18:21 +08:00
|
|
|
static ngx_conf_post_t ngx_accept_mutex_post = { ngx_accept_mutex_check } ;
|
|
|
|
|
|
|
|
|
|
|
2003-07-01 23:00:03 +08:00
|
|
|
static ngx_command_t ngx_event_core_commands[] = {
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
{ ngx_string("worker_connections"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_event_connections,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
NULL },
|
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
{ ngx_string("connections"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_event_connections,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
|
|
{ ngx_string("use"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_event_use,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-02-03 05:19:52 +08:00
|
|
|
{ ngx_string("multi_accept"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_conf_set_flag_slot,
|
|
|
|
|
0,
|
|
|
|
|
offsetof(ngx_event_conf_t, multi_accept),
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-04-02 00:20:53 +08:00
|
|
|
{ ngx_string("accept_mutex"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_conf_set_flag_slot,
|
|
|
|
|
0,
|
|
|
|
|
offsetof(ngx_event_conf_t, accept_mutex),
|
2004-09-23 00:18:21 +08:00
|
|
|
&ngx_accept_mutex_post },
|
2004-04-02 00:20:53 +08:00
|
|
|
|
2004-04-05 04:32:09 +08:00
|
|
|
{ ngx_string("accept_mutex_delay"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_conf_set_msec_slot,
|
|
|
|
|
0,
|
|
|
|
|
offsetof(ngx_event_conf_t, accept_mutex_delay),
|
|
|
|
|
NULL },
|
|
|
|
|
|
2004-04-08 23:58:25 +08:00
|
|
|
{ ngx_string("debug_connection"),
|
|
|
|
|
NGX_EVENT_CONF|NGX_CONF_TAKE1,
|
|
|
|
|
ngx_event_debug_connection,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
NULL },
|
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_null_command
|
2003-05-16 23:27:48 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2003-07-01 23:00:03 +08:00
|
|
|
ngx_event_module_t ngx_event_core_module_ctx = {
|
|
|
|
|
&event_core_name,
|
2003-05-20 00:39:14 +08:00
|
|
|
ngx_event_create_conf, /* create configuration */
|
|
|
|
|
ngx_event_init_conf, /* init configuration */
|
|
|
|
|
|
2004-07-07 14:15:04 +08:00
|
|
|
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
|
2003-05-20 00:39:14 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2003-07-01 23:00:03 +08:00
|
|
|
ngx_module_t ngx_event_core_module = {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
NGX_MODULE_V1,
|
2003-07-01 23:00:03 +08:00
|
|
|
&ngx_event_core_module_ctx, /* module context */
|
|
|
|
|
ngx_event_core_commands, /* module directives */
|
2003-05-27 20:18:54 +08:00
|
|
|
NGX_EVENT_MODULE, /* module type */
|
2005-09-08 22:36:09 +08:00
|
|
|
NULL, /* init master */
|
2004-04-02 00:20:53 +08:00
|
|
|
ngx_event_module_init, /* init module */
|
2005-09-08 22:36:09 +08:00
|
|
|
ngx_event_process_init, /* init process */
|
|
|
|
|
NULL, /* init thread */
|
|
|
|
|
NULL, /* exit thread */
|
|
|
|
|
NULL, /* exit process */
|
|
|
|
|
NULL, /* exit master */
|
|
|
|
|
NGX_MODULE_V1_PADDING
|
2003-05-16 23:27:48 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
void
|
|
|
|
|
ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
|
|
|
|
{
|
|
|
|
|
ngx_uint_t flags;
|
|
|
|
|
ngx_msec_t timer;
|
|
|
|
|
|
|
|
|
|
if (ngx_timer_resolution) {
|
|
|
|
|
timer = NGX_TIMER_INFINITE;
|
|
|
|
|
flags = 0;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
timer = ngx_event_find_timer();
|
|
|
|
|
flags = NGX_UPDATE_TIME;
|
|
|
|
|
|
|
|
|
|
#if (NGX_THREADS)
|
|
|
|
|
|
|
|
|
|
if (timer == NGX_TIMER_INFINITE || timer > 500) {
|
|
|
|
|
timer = 500;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ngx_accept_mutex) {
|
|
|
|
|
if (ngx_accept_disabled > 0) {
|
|
|
|
|
ngx_accept_disabled--;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ngx_accept_mutex_held) {
|
|
|
|
|
flags |= NGX_POST_EVENTS;
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
if (timer == NGX_TIMER_INFINITE
|
|
|
|
|
|| timer > ngx_accept_mutex_delay)
|
|
|
|
|
{
|
|
|
|
|
timer = ngx_accept_mutex_delay;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
(void) ngx_process_events(cycle, timer, flags);
|
|
|
|
|
|
|
|
|
|
ngx_event_expire_timers();
|
|
|
|
|
|
|
|
|
|
if (ngx_posted_accept_events) {
|
|
|
|
|
ngx_event_process_posted(cycle, &ngx_posted_accept_events);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ngx_accept_mutex_held) {
|
|
|
|
|
ngx_accept_mutex = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
|
|
|
|
"posted events %p", ngx_posted_events);
|
|
|
|
|
|
|
|
|
|
if (ngx_posted_events) {
|
|
|
|
|
if (ngx_threaded) {
|
|
|
|
|
ngx_wakeup_worker_thread(cycle);
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
ngx_event_process_posted(cycle, &ngx_posted_events);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
ngx_int_t
|
|
|
|
|
ngx_handle_read_event(ngx_event_t *rev, u_int flags)
|
|
|
|
|
{
|
|
|
|
|
if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* kqueue, epoll */
|
|
|
|
|
|
|
|
|
|
if (!rev->active && !rev->ready) {
|
|
|
|
|
if (ngx_add_event(rev, NGX_READ_EVENT, NGX_CLEAR_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
|
|
|
|
|
} else if (ngx_event_flags & NGX_USE_LEVEL_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* select, poll, /dev/poll */
|
|
|
|
|
|
|
|
|
|
if (!rev->active && !rev->ready) {
|
|
|
|
|
if (ngx_add_event(rev, NGX_READ_EVENT, NGX_LEVEL_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (rev->active && (rev->ready || (flags & NGX_CLOSE_EVENT))) {
|
|
|
|
|
if (ngx_del_event(rev, NGX_READ_EVENT, NGX_LEVEL_EVENT | flags)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else if (ngx_event_flags & NGX_USE_ONESHOT_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* event ports */
|
|
|
|
|
|
|
|
|
|
if (!rev->active) {
|
|
|
|
|
if (ngx_add_event(rev, NGX_READ_EVENT, NGX_ONESHOT_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* aio, iocp, rtsig */
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ngx_int_t
|
|
|
|
|
ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
|
|
|
|
|
{
|
|
|
|
|
ngx_connection_t *c;
|
|
|
|
|
|
|
|
|
|
if (lowat) {
|
|
|
|
|
c = (ngx_connection_t *) wev->data;
|
|
|
|
|
|
|
|
|
|
if (ngx_send_lowat(c, lowat) == NGX_ERROR) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ngx_event_flags & NGX_USE_CLEAR_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* kqueue, epoll */
|
|
|
|
|
|
|
|
|
|
if (!wev->active && !wev->ready) {
|
|
|
|
|
if (ngx_add_event(wev, NGX_WRITE_EVENT,
|
|
|
|
|
NGX_CLEAR_EVENT | (lowat ? NGX_LOWAT_EVENT : 0))
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
|
|
|
|
|
} else if (ngx_event_flags & NGX_USE_LEVEL_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* select, poll, /dev/poll */
|
|
|
|
|
|
|
|
|
|
if (!wev->active && !wev->ready) {
|
|
|
|
|
if (ngx_add_event(wev, NGX_WRITE_EVENT, NGX_LEVEL_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (wev->active && wev->ready) {
|
|
|
|
|
if (ngx_del_event(wev, NGX_WRITE_EVENT, NGX_LEVEL_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else if (ngx_event_flags & NGX_USE_ONESHOT_EVENT) {
|
|
|
|
|
|
|
|
|
|
/* event ports */
|
|
|
|
|
|
|
|
|
|
if (!wev->active) {
|
|
|
|
|
if (ngx_add_event(wev, NGX_WRITE_EVENT, NGX_ONESHOT_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* aio, iocp, rtsig */
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ngx_int_t
|
|
|
|
|
ngx_event_module_init(ngx_cycle_t *cycle)
|
2004-04-02 00:20:53 +08:00
|
|
|
{
|
2004-12-03 02:40:46 +08:00
|
|
|
void ***cf;
|
2005-09-23 19:02:22 +08:00
|
|
|
ngx_event_conf_t *ecf;
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_core_conf_t *ccf;
|
2005-09-23 19:02:22 +08:00
|
|
|
#if !(NGX_WIN32)
|
2004-12-03 02:40:46 +08:00
|
|
|
char *shared;
|
2005-09-23 19:02:22 +08:00
|
|
|
size_t size;
|
|
|
|
|
ngx_int_t limit;
|
|
|
|
|
struct rlimit rlmt;
|
|
|
|
|
#endif
|
2004-12-03 02:40:46 +08:00
|
|
|
|
|
|
|
|
cf = ngx_get_conf(cycle->conf_ctx, ngx_events_module);
|
|
|
|
|
|
|
|
|
|
if (cf == NULL) {
|
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
|
|
|
|
"no \"events\" section in configuration");
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ecf = (*cf)[ngx_event_core_module.ctx_index];
|
|
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
|
2004-12-03 02:40:46 +08:00
|
|
|
"using the \"%s\" event method", ecf->name);
|
|
|
|
|
|
2004-04-02 00:20:53 +08:00
|
|
|
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
ngx_timer_resolution = ccf->timer_resolution;
|
|
|
|
|
|
|
|
|
|
#if !(NGX_WIN32)
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
|
|
|
|
|
"getrlimit(RLIMIT_NOFILE) failed, ignored");
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
if (ecf->connections > (ngx_uint_t) rlmt.rlim_cur
|
|
|
|
|
&& (ccf->rlimit_nofile == NGX_CONF_UNSET
|
|
|
|
|
|| ecf->connections > (ngx_uint_t) ccf->rlimit_nofile))
|
|
|
|
|
{
|
|
|
|
|
limit = (ccf->rlimit_nofile == NGX_CONF_UNSET) ?
|
|
|
|
|
(ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile;
|
|
|
|
|
|
|
|
|
|
ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
|
|
|
|
|
"%ui worker_connections are more than "
|
|
|
|
|
"open file resource limit: %i",
|
|
|
|
|
ecf->connections, limit);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-04-24 00:50:51 +08:00
|
|
|
if (ccf->master == 0 || ngx_accept_mutex_ptr) {
|
2004-04-02 00:20:53 +08:00
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-01-25 20:27:35 +08:00
|
|
|
/* TODO: adjust cache line size, 128 is P4 cache line size */
|
2004-04-10 00:03:04 +08:00
|
|
|
|
|
|
|
|
size = 128 /* ngx_accept_mutex */
|
|
|
|
|
+ 128; /* ngx_connection_counter */
|
2004-04-02 00:20:53 +08:00
|
|
|
|
2004-09-15 03:39:54 +08:00
|
|
|
#if (NGX_STAT_STUB)
|
|
|
|
|
|
|
|
|
|
size += 128 /* ngx_stat_accepted */
|
2005-02-24 20:29:09 +08:00
|
|
|
+ 128 /* ngx_stat_handled */
|
2004-09-15 03:39:54 +08:00
|
|
|
+ 128 /* ngx_stat_requests */
|
|
|
|
|
+ 128 /* ngx_stat_active */
|
|
|
|
|
+ 128 /* ngx_stat_reading */
|
|
|
|
|
+ 128; /* ngx_stat_writing */
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
shared = ngx_create_shared_memory(size, cycle->log);
|
|
|
|
|
if (shared == NULL) {
|
2004-06-18 01:18:53 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2004-04-10 00:03:04 +08:00
|
|
|
|
2004-04-30 00:34:26 +08:00
|
|
|
ngx_accept_mutex_ptr = (ngx_atomic_t *) shared;
|
2004-04-10 00:03:04 +08:00
|
|
|
ngx_connection_counter = (ngx_atomic_t *) (shared + 128);
|
|
|
|
|
|
2004-09-15 03:39:54 +08:00
|
|
|
#if (NGX_STAT_STUB)
|
|
|
|
|
|
|
|
|
|
ngx_stat_accepted = (ngx_atomic_t *) (shared + 2 * 128);
|
2005-02-24 20:29:09 +08:00
|
|
|
ngx_stat_handled = (ngx_atomic_t *) (shared + 3 * 128);
|
|
|
|
|
ngx_stat_requests = (ngx_atomic_t *) (shared + 4 * 128);
|
|
|
|
|
ngx_stat_active = (ngx_atomic_t *) (shared + 5 * 128);
|
|
|
|
|
ngx_stat_reading = (ngx_atomic_t *) (shared + 6 * 128);
|
|
|
|
|
ngx_stat_writing = (ngx_atomic_t *) (shared + 7 * 128);
|
2004-09-15 03:39:54 +08:00
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
*ngx_connection_counter = 1;
|
|
|
|
|
|
2004-04-24 00:50:51 +08:00
|
|
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"counter: %p, %d",
|
2004-04-24 00:50:51 +08:00
|
|
|
ngx_connection_counter, *ngx_connection_counter);
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
#endif /* !(NGX_WIN32) */
|
2004-04-02 00:20:53 +08:00
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
#if !(NGX_WIN32)
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ngx_timer_signal_handler(int signo)
|
|
|
|
|
{
|
|
|
|
|
ngx_event_timer_alarm = 1;
|
|
|
|
|
|
|
|
|
|
ngx_time_update(0, 0);
|
|
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, "timer signal");
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static ngx_int_t
|
|
|
|
|
ngx_event_process_init(ngx_cycle_t *cycle)
|
2002-08-07 00:39:45 +08:00
|
|
|
{
|
2004-03-16 15:10:12 +08:00
|
|
|
ngx_uint_t m, i;
|
2003-06-11 23:28:34 +08:00
|
|
|
ngx_event_t *rev, *wev;
|
2005-09-23 19:02:22 +08:00
|
|
|
ngx_listening_t *ls;
|
|
|
|
|
ngx_connection_t *c, *next, *old;
|
2004-04-02 00:20:53 +08:00
|
|
|
ngx_core_conf_t *ccf;
|
2003-05-29 21:02:09 +08:00
|
|
|
ngx_event_conf_t *ecf;
|
2003-05-20 00:39:14 +08:00
|
|
|
ngx_event_module_t *module;
|
2004-11-11 22:07:14 +08:00
|
|
|
#if (NGX_WIN32)
|
2003-06-11 23:28:34 +08:00
|
|
|
ngx_iocp_conf_t *iocpcf;
|
2005-09-23 19:02:22 +08:00
|
|
|
#else
|
|
|
|
|
struct rlimit rlmt;
|
2005-10-19 20:33:58 +08:00
|
|
|
struct sigaction sa;
|
|
|
|
|
struct itimerval itv;
|
2003-06-11 23:28:34 +08:00
|
|
|
#endif
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2004-04-02 00:20:53 +08:00
|
|
|
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
2004-04-05 04:32:09 +08:00
|
|
|
ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);
|
2004-04-02 00:20:53 +08:00
|
|
|
|
2004-05-05 01:56:58 +08:00
|
|
|
if (ngx_accept_mutex_ptr && ccf->worker_processes > 1 && ecf->accept_mutex)
|
|
|
|
|
{
|
2004-04-02 00:20:53 +08:00
|
|
|
ngx_accept_mutex = ngx_accept_mutex_ptr;
|
2004-06-04 22:57:33 +08:00
|
|
|
ngx_accept_mutex_held = 0;
|
2004-04-05 04:32:09 +08:00
|
|
|
ngx_accept_mutex_delay = ecf->accept_mutex_delay;
|
2004-04-02 00:20:53 +08:00
|
|
|
}
|
|
|
|
|
|
2004-03-03 05:14:37 +08:00
|
|
|
#if (NGX_THREADS)
|
2005-03-19 20:38:37 +08:00
|
|
|
ngx_posted_events_mutex = ngx_mutex_init(cycle->log, 0);
|
|
|
|
|
if (ngx_posted_events_mutex == NULL) {
|
2004-03-03 05:14:37 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-02-26 04:16:15 +08:00
|
|
|
if (ngx_event_timer_init(cycle->log) == NGX_ERROR) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-12-09 23:08:11 +08:00
|
|
|
|
2003-07-07 14:11:50 +08:00
|
|
|
cycle->connection_n = ecf->connections;
|
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
for (m = 0; ngx_modules[m]; m++) {
|
2003-05-27 20:18:54 +08:00
|
|
|
if (ngx_modules[m]->type != NGX_EVENT_MODULE) {
|
2003-05-20 00:39:14 +08:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-27 20:18:54 +08:00
|
|
|
if (ngx_modules[m]->ctx_index == ecf->use) {
|
|
|
|
|
module = ngx_modules[m]->ctx;
|
2005-10-19 20:33:58 +08:00
|
|
|
if (module->actions.init(cycle, ngx_timer_resolution) == NGX_ERROR)
|
|
|
|
|
{
|
2004-01-30 05:45:01 +08:00
|
|
|
/* fatal */
|
|
|
|
|
exit(2);
|
2003-05-20 00:39:14 +08:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-01-09 13:36:00 +08:00
|
|
|
}
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
#if !(NGX_WIN32)
|
|
|
|
|
|
2005-10-19 20:33:58 +08:00
|
|
|
if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) {
|
|
|
|
|
|
|
|
|
|
ngx_memzero(&sa, sizeof(struct sigaction));
|
|
|
|
|
sa.sa_handler = ngx_timer_signal_handler;
|
|
|
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
|
|
|
|
|
|
if (sigaction(SIGALRM, &sa, NULL) == -1) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
|
|
|
|
|
"sigaction(SIGALRM) failed");
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
itv.it_interval.tv_sec = ngx_timer_resolution / 1000;
|
|
|
|
|
itv.it_interval.tv_usec = (ngx_timer_resolution % 1000) * 1000;
|
|
|
|
|
itv.it_value.tv_sec = ngx_timer_resolution / 1000;
|
|
|
|
|
itv.it_value.tv_usec = (ngx_timer_resolution % 1000 ) * 1000;
|
|
|
|
|
|
|
|
|
|
if (setitimer(ITIMER_REAL, &itv, NULL) == -1) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
|
|
|
|
|
"setitimer() failed");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
if (ngx_event_flags & NGX_USE_FD_EVENT) {
|
|
|
|
|
|
|
|
|
|
if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
|
|
|
|
|
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
|
|
|
|
|
"getrlimit(RLIMIT_NOFILE) failed");
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cycle->files_n = (ngx_uint_t) rlmt.rlim_cur;
|
|
|
|
|
|
|
|
|
|
cycle->files = ngx_calloc(sizeof(ngx_connection_t *) * cycle->files_n,
|
|
|
|
|
cycle->log);
|
|
|
|
|
if (cycle->files == NULL) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-07-04 14:03:52 +08:00
|
|
|
}
|
|
|
|
|
|
2004-06-28 02:01:57 +08:00
|
|
|
#endif
|
2005-09-23 19:02:22 +08:00
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
cycle->connections = ngx_alloc(sizeof(ngx_connection_t) * ecf->connections,
|
2005-09-23 19:02:22 +08:00
|
|
|
cycle->log);
|
2005-10-12 21:50:36 +08:00
|
|
|
if (cycle->connections == NULL) {
|
2005-09-23 19:02:22 +08:00
|
|
|
return NGX_ERROR;
|
2003-07-07 14:11:50 +08:00
|
|
|
}
|
|
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
c = cycle->connections;
|
2005-09-23 19:02:22 +08:00
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
cycle->read_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
|
2003-12-09 23:08:11 +08:00
|
|
|
cycle->log);
|
2005-10-12 21:50:36 +08:00
|
|
|
if (cycle->read_events == NULL) {
|
2003-12-09 23:08:11 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
rev = cycle->read_events;
|
2004-07-02 23:54:34 +08:00
|
|
|
for (i = 0; i < cycle->connection_n; i++) {
|
|
|
|
|
rev[i].closed = 1;
|
2005-01-19 21:10:56 +08:00
|
|
|
rev[i].instance = 1;
|
2004-07-05 23:08:23 +08:00
|
|
|
#if (NGX_THREADS)
|
|
|
|
|
rev[i].lock = &c[i].lock;
|
2004-07-07 14:15:04 +08:00
|
|
|
rev[i].own_lock = &c[i].lock;
|
2004-07-05 23:08:23 +08:00
|
|
|
#endif
|
2004-07-02 23:54:34 +08:00
|
|
|
}
|
|
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
cycle->write_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
|
2005-01-19 21:10:56 +08:00
|
|
|
cycle->log);
|
2005-10-12 21:50:36 +08:00
|
|
|
if (cycle->write_events == NULL) {
|
2003-12-09 23:08:11 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
wev = cycle->write_events;
|
2004-07-02 23:54:34 +08:00
|
|
|
for (i = 0; i < cycle->connection_n; i++) {
|
|
|
|
|
wev[i].closed = 1;
|
2004-07-05 23:08:23 +08:00
|
|
|
#if (NGX_THREADS)
|
|
|
|
|
wev[i].lock = &c[i].lock;
|
2004-07-07 14:15:04 +08:00
|
|
|
wev[i].own_lock = &c[i].lock;
|
2004-07-05 23:08:23 +08:00
|
|
|
#endif
|
2004-07-02 23:54:34 +08:00
|
|
|
}
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
i = cycle->connection_n;
|
|
|
|
|
next = NULL;
|
2003-06-11 23:28:34 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
do {
|
|
|
|
|
i--;
|
2002-08-20 22:48:28 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
c[i].data = next;
|
2005-10-12 21:50:36 +08:00
|
|
|
c[i].read = &cycle->read_events[i];
|
|
|
|
|
c[i].write = &cycle->write_events[i];
|
2005-09-23 19:02:22 +08:00
|
|
|
c[i].fd = (ngx_socket_t) -1;
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
next = &c[i];
|
2003-06-11 23:28:34 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
#if (NGX_THREADS)
|
|
|
|
|
c[i].lock = 0;
|
2003-06-11 23:28:34 +08:00
|
|
|
#endif
|
2005-09-23 19:02:22 +08:00
|
|
|
} while (i);
|
2002-12-23 14:29:22 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
cycle->free_connections = next;
|
|
|
|
|
cycle->free_connection_n = ecf->connections;
|
2003-07-07 14:11:50 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
/* for each listening socket */
|
|
|
|
|
|
|
|
|
|
ls = cycle->listening.elts;
|
|
|
|
|
for (i = 0; i < cycle->listening.nelts; i++) {
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
c = ngx_get_connection(ls[i].fd, cycle->log);
|
2003-06-11 23:28:34 +08:00
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
if (c == NULL) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c->log = &ls[i].log;
|
|
|
|
|
|
|
|
|
|
c->listening = &ls[i];
|
|
|
|
|
ls[i].connection = c;
|
|
|
|
|
|
|
|
|
|
c->ctx = ls[i].ctx;
|
|
|
|
|
c->servers = ls[i].servers;
|
|
|
|
|
|
2005-10-12 21:50:36 +08:00
|
|
|
rev = c->read;
|
2003-12-09 23:08:11 +08:00
|
|
|
|
2003-07-07 14:11:50 +08:00
|
|
|
rev->log = c->log;
|
2004-03-31 23:26:46 +08:00
|
|
|
rev->accept = 1;
|
|
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_DEFERRED_ACCEPT)
|
2005-09-23 19:02:22 +08:00
|
|
|
rev->deferred_accept = ls[i].deferred_accept;
|
2002-08-07 00:39:45 +08:00
|
|
|
#endif
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)) {
|
2005-09-23 19:02:22 +08:00
|
|
|
if (ls[i].previous) {
|
2003-07-07 14:11:50 +08:00
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
/*
|
|
|
|
|
* delete the old accept events that were bound to
|
|
|
|
|
* the old cycle read events array
|
|
|
|
|
*/
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
old = ls[i].previous->connection;
|
|
|
|
|
|
|
|
|
|
if (ngx_del_event(old->read, NGX_READ_EVENT, NGX_CLOSE_EVENT)
|
|
|
|
|
== NGX_ERROR)
|
2004-01-06 04:55:48 +08:00
|
|
|
{
|
2003-07-07 14:11:50 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
old->fd = (ngx_socket_t) -1;
|
2003-07-07 14:11:50 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-11 22:07:14 +08:00
|
|
|
#if (NGX_WIN32)
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-10-13 00:49:16 +08:00
|
|
|
if (ngx_event_flags & NGX_USE_IOCP_EVENT) {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
rev->handler = ngx_event_acceptex;
|
2003-02-07 01:21:13 +08:00
|
|
|
|
2003-06-11 23:28:34 +08:00
|
|
|
if (ngx_add_event(rev, 0, NGX_IOCP_ACCEPT) == NGX_ERROR) {
|
2003-02-07 01:21:13 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-23 19:02:22 +08:00
|
|
|
ls[i].log.handler = ngx_acceptex_log_error;
|
|
|
|
|
|
2003-07-07 14:11:50 +08:00
|
|
|
iocpcf = ngx_event_get_conf(cycle->conf_ctx, ngx_iocp_module);
|
2005-09-23 19:02:22 +08:00
|
|
|
if (ngx_event_post_acceptex(&ls[i], iocpcf->post_acceptex)
|
|
|
|
|
== NGX_ERROR)
|
2004-03-15 04:46:25 +08:00
|
|
|
{
|
2003-06-11 23:28:34 +08:00
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-02-07 01:21:13 +08:00
|
|
|
|
|
|
|
|
} else {
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
rev->handler = ngx_event_accept;
|
2004-11-11 22:07:14 +08:00
|
|
|
|
2004-03-31 23:26:46 +08:00
|
|
|
if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2003-02-07 01:21:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
rev->handler = ngx_event_accept;
|
2004-02-18 01:53:12 +08:00
|
|
|
|
2004-06-04 22:57:33 +08:00
|
|
|
if (ngx_accept_mutex) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2004-06-01 14:04:46 +08:00
|
|
|
|
2004-06-07 03:49:18 +08:00
|
|
|
if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
|
2004-06-04 22:57:33 +08:00
|
|
|
if (ngx_add_conn(c) == NGX_ERROR) {
|
|
|
|
|
return NGX_ERROR;
|
2004-03-31 23:26:46 +08:00
|
|
|
}
|
2004-06-01 14:04:46 +08:00
|
|
|
|
2004-02-18 01:53:12 +08:00
|
|
|
} else {
|
2004-03-31 23:26:46 +08:00
|
|
|
if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
2004-02-18 01:53:12 +08:00
|
|
|
}
|
2003-02-07 01:21:13 +08:00
|
|
|
|
|
|
|
|
#endif
|
2005-09-23 19:02:22 +08:00
|
|
|
|
2002-08-07 00:39:45 +08:00
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
|
|
|
|
|
return NGX_OK;
|
2002-08-20 22:48:28 +08:00
|
|
|
}
|
2002-08-07 00:39:45 +08:00
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
ngx_int_t
|
|
|
|
|
ngx_send_lowat(ngx_connection_t *c, size_t lowat)
|
2004-10-11 23:07:03 +08:00
|
|
|
{
|
|
|
|
|
int sndlowat;
|
|
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
#if (NGX_HAVE_LOWAT_EVENT)
|
2004-10-11 23:07:03 +08:00
|
|
|
|
2004-10-21 23:34:38 +08:00
|
|
|
if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
|
2004-10-11 23:07:03 +08:00
|
|
|
c->write->available = lowat;
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (lowat == 0 || c->sndlowat) {
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sndlowat = (int) lowat;
|
|
|
|
|
|
|
|
|
|
if (setsockopt(c->fd, SOL_SOCKET, SO_SNDLOWAT,
|
|
|
|
|
(const void *) &sndlowat, sizeof(int)) == -1)
|
|
|
|
|
{
|
|
|
|
|
ngx_connection_error(c, ngx_socket_errno,
|
|
|
|
|
"setsockopt(SO_SNDLOWAT) failed");
|
|
|
|
|
return NGX_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c->sndlowat = 1;
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_events_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
2003-05-16 23:27:48 +08:00
|
|
|
{
|
2005-03-19 20:38:37 +08:00
|
|
|
char *rv;
|
2003-05-20 00:39:14 +08:00
|
|
|
void ***ctx;
|
2005-03-19 20:38:37 +08:00
|
|
|
ngx_uint_t i;
|
2003-05-20 00:39:14 +08:00
|
|
|
ngx_conf_t pcf;
|
2005-03-19 20:38:37 +08:00
|
|
|
ngx_event_module_t *m;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
|
|
|
|
/* count the number of the event modules and set up their indices */
|
|
|
|
|
|
|
|
|
|
ngx_event_max_module = 0;
|
2005-03-19 20:38:37 +08:00
|
|
|
for (i = 0; ngx_modules[i]; i++) {
|
|
|
|
|
if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
|
2003-05-20 00:39:14 +08:00
|
|
|
continue;
|
|
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
ngx_modules[i]->ctx_index = ngx_event_max_module++;
|
2003-05-20 00:39:14 +08:00
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
ctx = ngx_pcalloc(cf->pool, sizeof(void *));
|
|
|
|
|
if (ctx == NULL) {
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
*ctx = ngx_pcalloc(cf->pool, ngx_event_max_module * sizeof(void *));
|
|
|
|
|
if (*ctx == NULL) {
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
*(void **) conf = ctx;
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
for (i = 0; ngx_modules[i]; i++) {
|
|
|
|
|
if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
|
2003-05-20 00:39:14 +08:00
|
|
|
continue;
|
|
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
m = ngx_modules[i]->ctx;
|
2003-05-16 23:27:48 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
if (m->create_conf) {
|
|
|
|
|
(*ctx)[ngx_modules[i]->ctx_index] = m->create_conf(cf->cycle);
|
|
|
|
|
if ((*ctx)[ngx_modules[i]->ctx_index] == NULL) {
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
}
|
|
|
|
|
}
|
2003-05-16 23:27:48 +08:00
|
|
|
|
|
|
|
|
pcf = *cf;
|
2003-05-20 00:39:14 +08:00
|
|
|
cf->ctx = ctx;
|
2003-05-27 20:18:54 +08:00
|
|
|
cf->module_type = NGX_EVENT_MODULE;
|
2003-05-16 23:27:48 +08:00
|
|
|
cf->cmd_type = NGX_EVENT_CONF;
|
2005-03-19 20:38:37 +08:00
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
rv = ngx_conf_parse(cf, NULL);
|
2005-03-19 20:38:37 +08:00
|
|
|
|
2003-05-16 23:27:48 +08:00
|
|
|
*cf = pcf;
|
|
|
|
|
|
|
|
|
|
if (rv != NGX_CONF_OK)
|
|
|
|
|
return rv;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
for (i = 0; ngx_modules[i]; i++) {
|
|
|
|
|
if (ngx_modules[i]->type != NGX_EVENT_MODULE) {
|
2003-05-20 00:39:14 +08:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
m = ngx_modules[i]->ctx;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
if (m->init_conf) {
|
|
|
|
|
rv = m->init_conf(cf->cycle, (*ctx)[ngx_modules[i]->ctx_index]);
|
2003-05-20 00:39:14 +08:00
|
|
|
if (rv != NGX_CONF_OK) {
|
|
|
|
|
return rv;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_event_connections(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
2003-12-09 23:08:11 +08:00
|
|
|
{
|
|
|
|
|
ngx_event_conf_t *ecf = conf;
|
|
|
|
|
|
|
|
|
|
ngx_str_t *value;
|
|
|
|
|
|
2004-04-22 02:54:33 +08:00
|
|
|
if (ecf->connections != NGX_CONF_UNSET_UINT) {
|
2003-12-09 23:08:11 +08:00
|
|
|
return "is duplicate" ;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
value = cf->args->elts;
|
|
|
|
|
ecf->connections = ngx_atoi(value[1].data, value[1].len);
|
2004-04-22 02:54:33 +08:00
|
|
|
if (ecf->connections == (ngx_uint_t) NGX_ERROR) {
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"invalid number \"%V\"", &value[1]);
|
2003-12-09 23:08:11 +08:00
|
|
|
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cf->cycle->connection_n = ecf->connections;
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
2003-05-20 00:39:14 +08:00
|
|
|
{
|
2003-05-27 20:18:54 +08:00
|
|
|
ngx_event_conf_t *ecf = conf;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-02-10 04:47:18 +08:00
|
|
|
ngx_int_t m;
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_str_t *value;
|
|
|
|
|
ngx_event_conf_t *old_ecf;
|
2003-05-20 00:39:14 +08:00
|
|
|
ngx_event_module_t *module;
|
|
|
|
|
|
2004-06-16 23:32:11 +08:00
|
|
|
if (ecf->use != NGX_CONF_UNSET_UINT) {
|
2003-05-21 21:28:21 +08:00
|
|
|
return "is duplicate" ;
|
2003-05-20 00:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
value = cf->args->elts;
|
|
|
|
|
|
2004-01-15 02:19:42 +08:00
|
|
|
if (cf->cycle->old_cycle->conf_ctx) {
|
2003-12-09 23:08:11 +08:00
|
|
|
old_ecf = ngx_event_get_conf(cf->cycle->old_cycle->conf_ctx,
|
|
|
|
|
ngx_event_core_module);
|
|
|
|
|
} else {
|
|
|
|
|
old_ecf = NULL;
|
|
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-02-04 00:43:54 +08:00
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
for (m = 0; ngx_modules[m]; m++) {
|
2003-05-27 20:18:54 +08:00
|
|
|
if (ngx_modules[m]->type != NGX_EVENT_MODULE) {
|
2003-05-20 00:39:14 +08:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module = ngx_modules[m]->ctx;
|
2003-12-09 23:08:11 +08:00
|
|
|
if (module->name->len == value[1].len) {
|
|
|
|
|
if (ngx_strcmp(module->name->data, value[1].data) == 0) {
|
2003-05-27 20:18:54 +08:00
|
|
|
ecf->use = ngx_modules[m]->ctx_index;
|
2003-12-09 23:08:11 +08:00
|
|
|
ecf->name = module->name->data;
|
|
|
|
|
|
2004-02-04 00:43:54 +08:00
|
|
|
if (ngx_process == NGX_PROCESS_SINGLE
|
|
|
|
|
&& old_ecf
|
|
|
|
|
&& old_ecf->use != ecf->use)
|
|
|
|
|
{
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
2004-11-21 03:52:20 +08:00
|
|
|
"when the server runs without a master process "
|
|
|
|
|
"the \"%V\" event type must be the same as "
|
|
|
|
|
"in previous configuration - \"%s\" "
|
|
|
|
|
"and it can not be changed on the fly, "
|
|
|
|
|
"to change it you need to stop server "
|
|
|
|
|
"and start it again",
|
|
|
|
|
&value[1], old_ecf->name);
|
2004-02-04 00:43:54 +08:00
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2003-12-09 23:08:11 +08:00
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"invalid event type \"%V\"", &value[1]);
|
2003-12-09 23:08:11 +08:00
|
|
|
|
|
|
|
|
return NGX_CONF_ERROR;
|
2003-05-20 00:39:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_event_debug_connection(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
2004-04-08 23:58:25 +08:00
|
|
|
{
|
|
|
|
|
#if (NGX_DEBUG)
|
|
|
|
|
ngx_event_conf_t *ecf = conf;
|
|
|
|
|
|
|
|
|
|
in_addr_t *addr;
|
|
|
|
|
ngx_str_t *value;
|
|
|
|
|
struct hostent *h;
|
|
|
|
|
|
|
|
|
|
value = cf->args->elts;
|
|
|
|
|
|
|
|
|
|
/* AF_INET only */
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
addr = ngx_array_push(&ecf->debug_connection);
|
|
|
|
|
if (addr == NULL) {
|
2004-04-08 23:58:25 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*addr = inet_addr((char *) value[1].data);
|
|
|
|
|
|
|
|
|
|
if (*addr != INADDR_NONE) {
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
h = gethostbyname((char *) value[1].data);
|
|
|
|
|
|
|
|
|
|
if (h == NULL || h->h_addr_list[0] == NULL) {
|
|
|
|
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
2004-11-11 22:07:14 +08:00
|
|
|
"host \"%s\" not found", value[1].data);
|
2004-04-08 23:58:25 +08:00
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*addr = *(in_addr_t *)(h->h_addr_list[0]);
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
|
|
|
|
"\"debug_connection\" is ignored, you need to rebuild "
|
|
|
|
|
"nginx using --with-debug option to enable it");
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return NGX_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static void *
|
|
|
|
|
ngx_event_create_conf(ngx_cycle_t *cycle)
|
2003-05-20 00:39:14 +08:00
|
|
|
{
|
|
|
|
|
ngx_event_conf_t *ecf;
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
ecf = ngx_palloc(cycle->pool, sizeof(ngx_event_conf_t));
|
|
|
|
|
if (ecf == NULL) {
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-04-22 02:54:33 +08:00
|
|
|
ecf->connections = NGX_CONF_UNSET_UINT;
|
2004-06-18 01:18:53 +08:00
|
|
|
ecf->use = NGX_CONF_UNSET_UINT;
|
2004-02-03 05:19:52 +08:00
|
|
|
ecf->multi_accept = NGX_CONF_UNSET;
|
2004-04-02 00:20:53 +08:00
|
|
|
ecf->accept_mutex = NGX_CONF_UNSET;
|
2004-04-05 04:32:09 +08:00
|
|
|
ecf->accept_mutex_delay = NGX_CONF_UNSET_MSEC;
|
2003-12-09 23:08:11 +08:00
|
|
|
ecf->name = (void *) NGX_CONF_UNSET;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-04-08 23:58:25 +08:00
|
|
|
#if (NGX_DEBUG)
|
2005-03-19 20:38:37 +08:00
|
|
|
|
|
|
|
|
if (ngx_array_init(&ecf->debug_connection, cycle->pool, 4,
|
|
|
|
|
sizeof(in_addr_t)) == NGX_ERROR)
|
|
|
|
|
{
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-08 23:58:25 +08:00
|
|
|
#endif
|
|
|
|
|
|
2003-05-20 00:39:14 +08:00
|
|
|
return ecf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
|
2003-05-20 00:39:14 +08:00
|
|
|
{
|
2004-06-15 15:55:11 +08:00
|
|
|
ngx_event_conf_t *ecf = conf;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
#if (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
|
|
|
|
|
int fd;
|
|
|
|
|
#endif
|
|
|
|
|
#if (NGX_HAVE_RTSIG)
|
|
|
|
|
ngx_uint_t rtsig;
|
|
|
|
|
#endif
|
2004-11-21 03:52:20 +08:00
|
|
|
ngx_int_t i, connections;
|
|
|
|
|
ngx_module_t *module;
|
|
|
|
|
ngx_core_conf_t *ccf;
|
|
|
|
|
ngx_event_module_t *event_module;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
connections = NGX_CONF_UNSET_UINT;
|
|
|
|
|
module = NULL;
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
|
2003-05-20 23:37:55 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
fd = epoll_create(100);
|
2003-05-20 23:37:55 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
if (fd != -1) {
|
|
|
|
|
close(fd);
|
|
|
|
|
connections = DEFAULT_CONNECTIONS;
|
|
|
|
|
module = &ngx_epoll_module;
|
2004-02-09 15:46:43 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
} else if (ngx_errno != NGX_ENOSYS) {
|
|
|
|
|
connections = DEFAULT_CONNECTIONS;
|
|
|
|
|
module = &ngx_epoll_module;
|
|
|
|
|
}
|
2004-02-09 15:46:43 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
#endif
|
2004-06-11 02:36:57 +08:00
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_RTSIG)
|
2004-06-11 02:36:57 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
if (module == NULL) {
|
|
|
|
|
connections = DEFAULT_CONNECTIONS;
|
|
|
|
|
module = &ngx_rtsig_module;
|
|
|
|
|
rtsig = 1;
|
2005-03-19 20:38:37 +08:00
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
rtsig = 0;
|
2004-11-21 03:52:20 +08:00
|
|
|
}
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-06-16 01:47:16 +08:00
|
|
|
#endif
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_DEVPOLL)
|
2004-11-21 03:52:20 +08:00
|
|
|
|
|
|
|
|
connections = DEFAULT_CONNECTIONS;
|
|
|
|
|
module = &ngx_devpoll_module;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_KQUEUE)
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
connections = DEFAULT_CONNECTIONS;
|
|
|
|
|
module = &ngx_kqueue_module;
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-11-26 00:17:31 +08:00
|
|
|
#if (NGX_HAVE_SELECT)
|
2004-11-21 03:52:20 +08:00
|
|
|
|
|
|
|
|
if (module == NULL) {
|
|
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
#if (NGX_WIN32 || FD_SETSIZE >= DEFAULT_CONNECTIONS)
|
2004-11-21 03:52:20 +08:00
|
|
|
connections = DEFAULT_CONNECTIONS;
|
2004-02-10 04:47:18 +08:00
|
|
|
#else
|
2005-03-19 20:38:37 +08:00
|
|
|
connections = FD_SETSIZE;
|
2004-11-21 03:52:20 +08:00
|
|
|
#endif
|
|
|
|
|
module = &ngx_select_module;
|
|
|
|
|
}
|
2004-02-10 04:47:18 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
#endif
|
2004-02-10 04:47:18 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
if (module == NULL) {
|
|
|
|
|
for (i = 0; ngx_modules[i]; i++) {
|
|
|
|
|
if (ngx_modules[i]->type == NGX_EVENT_MODULE) {
|
|
|
|
|
event_module = ngx_modules[i]->ctx;
|
2004-02-10 04:47:18 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
if (ngx_strcmp(event_module->name->data, event_core_name.data)
|
|
|
|
|
== 0)
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2004-02-10 04:47:18 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
module = ngx_modules[i];
|
|
|
|
|
break;
|
2004-02-10 04:47:18 +08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
if (module == NULL) {
|
2004-02-10 04:47:18 +08:00
|
|
|
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "no events module found");
|
|
|
|
|
return NGX_CONF_ERROR;
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
ngx_conf_init_unsigned_value(ecf->connections, connections);
|
|
|
|
|
cycle->connection_n = ecf->connections;
|
2004-02-10 04:47:18 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
ngx_conf_init_unsigned_value(ecf->use, module->ctx_index);
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
event_module = module->ctx;
|
|
|
|
|
ngx_conf_init_ptr_value(ecf->name, event_module->name->data);
|
2003-12-09 23:08:11 +08:00
|
|
|
|
2004-02-04 04:27:11 +08:00
|
|
|
ngx_conf_init_value(ecf->multi_accept, 0);
|
2004-04-02 00:20:53 +08:00
|
|
|
ngx_conf_init_value(ecf->accept_mutex, 1);
|
2004-04-05 04:32:09 +08:00
|
|
|
ngx_conf_init_msec_value(ecf->accept_mutex_delay, 500);
|
2003-05-20 00:39:14 +08:00
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
|
2005-03-19 20:38:37 +08:00
|
|
|
#if (NGX_HAVE_RTSIG)
|
|
|
|
|
|
|
|
|
|
if (!rtsig) {
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (ecf->accept_mutex) {
|
2004-11-21 03:52:20 +08:00
|
|
|
return NGX_CONF_OK;
|
2004-06-15 15:55:11 +08:00
|
|
|
}
|
|
|
|
|
|
2004-11-21 03:52:20 +08:00
|
|
|
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
|
|
|
|
|
|
|
|
|
if (ccf->worker_processes == 0) {
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
|
|
|
|
"the \"rtsig\" method requires \"accept_mutex\" to be on");
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_ERROR;
|
2003-05-16 23:27:48 +08:00
|
|
|
}
|
2004-09-23 00:18:21 +08:00
|
|
|
|
|
|
|
|
|
nginx-0.1.29-RELEASE import
*) Feature: the ngx_http_ssi_module supports "include virtual" command.
*) Feature: the ngx_http_ssi_module supports the condition command like
'if expr="$NAME"' and "else" and "endif" commands. Only one nested
level is supported.
*) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and
DATE_GMT variables and "config timefmt" command.
*) Feature: the "ssi_ignore_recycled_buffers" directive.
*) Bugfix: the "echo" command did not show the default value for the
empty QUERY_STRING variable.
*) Change: the ngx_http_proxy_module was rewritten.
*) Feature: the "proxy_redirect", "proxy_pass_request_headers",
"proxy_pass_request_body", and "proxy_method" directives.
*) Feature: the "proxy_set_header" directive. The "proxy_x_var" was
canceled and must be replaced with the proxy_set_header directive.
*) Change: the "proxy_preserve_host" is canceled and must be replaced
with the "proxy_set_header Host $host" and the "proxy_redirect off"
directives, the "proxy_set_header Host $host:$proxy_port" directive
and the appropriate proxy_redirect directives.
*) Change: the "proxy_set_x_real_ip" is canceled and must be replaced
with the "proxy_set_header X-Real-IP $remote_addr" directive.
*) Change: the "proxy_add_x_forwarded_for" is canceled and must be
replaced with
the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for"
directive.
*) Change: the "proxy_set_x_url" is canceled and must be replaced with
the "proxy_set_header X-URL http://$host:$server_port$request_uri"
directive.
*) Feature: the "fastcgi_param" directive.
*) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params"
directive are canceled and must be replaced with the fastcgi_param
directives.
*) Feature: the "index" directive can use the variables.
*) Feature: the "index" directive can be used at http and server levels.
*) Change: the last index only in the "index" directive can be absolute.
*) Feature: the "rewrite" directive can use the variables.
*) Feature: the "internal" directive.
*) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR,
SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME,
REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables.
*) Change: nginx now passes the invalid lines in a client request
headers or a backend response header.
*) Bugfix: if the backend did not transfer response for a long time and
the "send_timeout" was less than "proxy_read_timeout", then nginx
returned the 408 response.
*) Bugfix: the segmentation fault was occurred if the backend sent an
invalid line in response header; the bug had appeared in 0.1.26.
*) Bugfix: the segmentation fault may occurred in FastCGI fault
tolerance configuration.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" and "Cache-Control" headers.
*) Bugfix: nginx did not take into account trailing dot in "Host"
header line.
*) Bugfix: the ngx_http_auth_module did not work under Linux.
*) Bugfix: the rewrite directive worked incorrectly, if the arguments
were in a request.
*) Bugfix: nginx could not be built on MacOS X.
2005-05-12 22:58:06 +08:00
|
|
|
static char *
|
|
|
|
|
ngx_accept_mutex_check(ngx_conf_t *cf, void *post, void *data)
|
2004-09-23 00:18:21 +08:00
|
|
|
{
|
|
|
|
|
#if !(NGX_HAVE_ATOMIC_OPS)
|
|
|
|
|
|
|
|
|
|
ngx_flag_t *fp = data;
|
|
|
|
|
|
|
|
|
|
*fp = 0;
|
|
|
|
|
|
|
|
|
|
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
|
2005-03-23 00:02:46 +08:00
|
|
|
"\"accept_mutex\" is not supported on this platform, "
|
|
|
|
|
"ignored");
|
2004-09-23 00:18:21 +08:00
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return NGX_CONF_OK;
|
|
|
|
|
}
|