mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.1-2003-07-11-08:50:59 import

Browse Source
This commit is contained in:
Igor Sysoev 2003-07-11 04:50:59 +00:00
parent b8c367c7b9
commit a7f7fa878c
8 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/ngx_config.h
View File

@ -33,6 +33,19 @@
#if !(WIN32)
#define ngx_signal_helper(n) SIG##n
#define ngx_signal_value(n) ngx_signal_helper(n)
/* TODO: #ifndef */
#define NGX_RESTART_SIGNAL HUP
#define NGX_ROTATE_SIGNAL USR1
#endif
/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */ /* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */
#define NGX_INVALID_ARRAY_INDEX 0x80000000 #define NGX_INVALID_ARRAY_INDEX 0x80000000

3
src/core/ngx_log.c
View File

@ -37,7 +37,8 @@ ngx_module_t ngx_errlog_module = {
&errlog_name, /* module context */ &errlog_name, /* module context */
ngx_errlog_commands, /* module directives */ ngx_errlog_commands, /* module directives */
NGX_CORE_MODULE, /* module type */ NGX_CORE_MODULE, /* module type */
NULL /* init module */ NULL, /* init module */
NULL /* init child */
}; };

20
src/event/modules/ngx_devpoll_module.c
View File

@ -26,8 +26,8 @@ struct dvpoll {
typedef struct { typedef struct {
int changes; u_int changes;
int events; u_int events;
} ngx_devpoll_conf_t; } ngx_devpoll_conf_t;
@ -43,8 +43,7 @@ static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf);
static int dp; static int dp;
static struct pollfd *change_list, *event_list; static struct pollfd *change_list, *event_list;
static u_int nchanges, max_changes; static u_int nchanges, max_changes, nevents;
static int nevents;
static ngx_event_t **change_index; static ngx_event_t **change_index;
@ -95,7 +94,8 @@ ngx_module_t ngx_devpoll_module = {
&ngx_devpoll_module_ctx, /* module context */ &ngx_devpoll_module_ctx, /* module context */
ngx_devpoll_commands, /* module directives */ ngx_devpoll_commands, /* module directives */
NGX_EVENT_MODULE, /* module type */ NGX_EVENT_MODULE, /* module type */
NULL /* init module */ NULL, /* init module */
NULL /* init child */
}; };
@ -321,7 +321,7 @@ static int ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
int ngx_devpoll_process_events(ngx_log_t *log) int ngx_devpoll_process_events(ngx_log_t *log)
{ {
int events, n, i; int events, n, i, j;
ngx_msec_t timer, delta; ngx_msec_t timer, delta;
ngx_err_t err; ngx_err_t err;
ngx_cycle_t **cycle; ngx_cycle_t **cycle;
@ -397,11 +397,11 @@ int ngx_devpoll_process_events(ngx_log_t *log)
if (c->fd == -1) { if (c->fd == -1) {
cycle = ngx_old_cycles.elts; cycle = ngx_old_cycles.elts;
for (i = 0; i < ngx_old_cycles.nelts; i++) { for (j = 0; j < ngx_old_cycles.nelts; j++) {
if (cycle[i] == NULL) { if (cycle[i] == NULL) {
continue; continue;
} }
c = &cycle[i]->connections[event_list[i].fd]; c = &cycle[j]->connections[event_list[i].fd];
if (c->fd != -1) { if (c->fd != -1) {
break; break;
} }
@ -471,8 +471,8 @@ static char *ngx_devpoll_init_conf(ngx_cycle_t *cycle, void *conf)
{ {
ngx_devpoll_conf_t *dpcf = conf; ngx_devpoll_conf_t *dpcf = conf;
ngx_conf_init_value(dpcf->changes, 512); ngx_conf_init_unsigned_value(dpcf->changes, 512);
ngx_conf_init_value(dpcf->events, 512); ngx_conf_init_unsigned_value(dpcf->events, 512);
return NGX_CONF_OK; return NGX_CONF_OK;
} }

10
src/event/modules/ngx_poll_module.c
View File

@ -224,8 +224,8 @@ static int ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
static int ngx_poll_process_events(ngx_log_t *log) static int ngx_poll_process_events(ngx_log_t *log)
{ {
int ready, found; int ready, found, j;
u_int i, nready; u_int nready, i;
ngx_msec_t timer, delta; ngx_msec_t timer, delta;
ngx_err_t err; ngx_err_t err;
ngx_cycle_t **cycle; ngx_cycle_t **cycle;
@ -293,11 +293,11 @@ static int ngx_poll_process_events(ngx_log_t *log)
if (c->fd == -1) { if (c->fd == -1) {
cycle = ngx_old_cycles.elts; cycle = ngx_old_cycles.elts;
for (i = 0; i < ngx_old_cycles.nelts; i++) { for (j = 0; j < ngx_old_cycles.nelts; j++) {
if (cycle[i] == NULL) { if (cycle[j] == NULL) {
continue; continue;
} }
c = &cycle[i]->connections[event_list[i].fd]; c = &cycle[j]->connections[event_list[i].fd];
if (c->fd != -1) { if (c->fd != -1) {
break; break;
} }

1
src/http/modules/ngx_http_log_handler.c
View File

@ -45,6 +45,7 @@ ngx_module_t ngx_http_log_module = {
ngx_http_log_commands, /* module directives */ ngx_http_log_commands, /* module directives */
NGX_HTTP_MODULE, /* module type */ NGX_HTTP_MODULE, /* module type */
NULL, /* init module */ NULL, /* init module */
NULL /* init child */
}; };

3
src/http/ngx_http.c
View File

@ -36,7 +36,8 @@ ngx_module_t ngx_http_module = {
&http_name, /* module context */ &http_name, /* module context */
ngx_http_commands, /* module directives */ ngx_http_commands, /* module directives */
NGX_CORE_MODULE, /* module type */ NGX_CORE_MODULE, /* module type */
NULL /* init module */ NULL, /* init module */
NULL /* init child */
}; };

3
src/http/ngx_http_output_filter.c
View File

@ -53,7 +53,8 @@ ngx_module_t ngx_http_output_filter_module = {
&ngx_http_output_filter_module_ctx, /* module context */ &ngx_http_output_filter_module_ctx, /* module context */
ngx_http_output_filter_commands, /* module directives */ ngx_http_output_filter_commands, /* module directives */
NGX_HTTP_MODULE, /* module type */ NGX_HTTP_MODULE, /* module type */
NULL /* init module */ NULL, /* init module */
NULL /* init child */
}; };

8
src/os/unix/ngx_posix_init.c
View File

@ -26,16 +26,16 @@ int ngx_posix_init(ngx_log_t *log)
} }
sa.sa_handler = ngx_restart_signal_handler; sa.sa_handler = ngx_restart_signal_handler;
if (sigaction(SIGHUP, &sa, NULL) == -1) { if (sigaction(ngx_signal_value(NGX_RESTART_SIGNAL), &sa, NULL) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
"sigaction(SIGHUP) failed"); "sigaction(SIG" ngx_value(NGX_RESTART_SIGNAL) ") failed");
return NGX_ERROR; return NGX_ERROR;
} }
sa.sa_handler = ngx_rotate_signal_handler; sa.sa_handler = ngx_rotate_signal_handler;
if (sigaction(SIGUSR1, &sa, NULL) == -1) { if (sigaction(ngx_signal_value(NGX_ROTATE_SIGNAL), &sa, NULL) == -1) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
"sigaction(SIGUSR1) failed"); "sigaction(SIG" ngx_value(NGX_ROTATE_SIGNAL) ") failed");
return NGX_ERROR; return NGX_ERROR;
} }