IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-27 09:21:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.0.2-2004-02-04-23:30:08 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-02-04 20:30:08 +00:00
parent af57922780
commit c537167285
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/nginx.c
View File

@ -221,7 +221,7 @@ int main(int argc, char *const *argv, char **envp)
}
/* TODO: broken single process */
/* TODO: broken NGX_PROCESS_SINGLE */
static void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
{
@ -634,6 +634,12 @@ static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data)
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle");
ngx_process_events(cycle->log);
if (ngx_reopen) {
ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reopen logs");
ngx_reopen_files(cycle, -1);
ngx_reopen = 0;
}
}
}

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

@ -312,6 +312,13 @@ static int ngx_poll_process_events(ngx_log_t *log)
event_list[i].events, event_list[i].revents);
}
if (event_list[i].fd == -1) {
/* the disabled event, workaround for our possible bug */
continue;
}
c = &ngx_cycle->connections[event_list[i].fd];
if (c->fd == -1) {

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

@ -144,14 +144,9 @@ void ngx_signal_handler(int signo)
break;
case ngx_signal_value(NGX_REOPEN_SIGNAL):
if (ngx_noaccept) {
action = ", ignoring";
} else {
ngx_reopen = 1;
action = ", reopen logs";
break;
}
ngx_reopen = 1;
action = ", reopen logs";
break;
case ngx_signal_value(NGX_CHANGEBIN_SIGNAL):
if ((ngx_inherited && getppid() > 1)