diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gw_backend.c | 17 | ||||
-rw-r--r-- | src/mod_cgi.c | 6 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/gw_backend.c b/src/gw_backend.c index 5bb654f1..1078fcd2 100644 --- a/src/gw_backend.c +++ b/src/gw_backend.c @@ -754,9 +754,7 @@ static void gw_proc_kill(gw_host *host, gw_proc *proc) { host->unused_procs->prev = proc; host->unused_procs = proc; - #ifdef HAVE_FORK - kill(proc->pid, host->kill_signal); - #endif + fdevent_kill(proc->pid, host->kill_signal); gw_proc_set_state(host, proc, PROC_STATE_KILLED); } @@ -1047,12 +1045,10 @@ static void gw_restart_dead_proc(gw_host * const host, log_error_st * const errh break; case PROC_STATE_KILLED: if (trigger && ++proc->disabled_until > 4) { - #ifdef HAVE_FORK int sig = (proc->disabled_until <= 8) ? host->kill_signal : proc->disabled_until <= 16 ? SIGTERM : SIGKILL; - kill(proc->pid, sig); - #endif + fdevent_kill(proc->pid, sig); } break; case PROC_STATE_DIED_WAIT_FOR_PID: @@ -1205,11 +1201,8 @@ void gw_plugin_config_free(gw_plugin_config *s) { for (proc = host->first; proc; proc = proc->next) { if (proc->pid > 0) { - #ifdef HAVE_FORK - kill(proc->pid, host->kill_signal); - #endif + fdevent_kill(proc->pid, host->kill_signal); } - if (proc->is_local && proc->unixsocket) { unlink(proc->unixsocket->ptr); } @@ -1217,9 +1210,7 @@ void gw_plugin_config_free(gw_plugin_config *s) { for (proc = host->unused_procs; proc; proc = proc->next) { if (proc->pid > 0) { - #ifdef HAVE_FORK - kill(proc->pid, host->kill_signal); - #endif + fdevent_kill(proc->pid, host->kill_signal); } if (proc->is_local && proc->unixsocket) { unlink(proc->unixsocket->ptr); diff --git a/src/mod_cgi.c b/src/mod_cgi.c index aa9f400b..082f2570 100644 --- a/src/mod_cgi.c +++ b/src/mod_cgi.c @@ -414,11 +414,7 @@ static cgi_pid_t * cgi_pid_add(plugin_data *p, pid_t pid, handler_ctx *hctx) { static void cgi_pid_kill(cgi_pid_t *cgi_pid, int sig) { cgi_pid->signal_sent = sig; /*(save last signal sent)*/ - #ifdef HAVE_FORK - /* XXX: future: revisit on _WIN32 - * (perhaps use pid_t as process handle) */ - kill(cgi_pid->pid, sig); - #endif + fdevent_kill(cgi_pid->pid, sig); } static void cgi_pid_del(plugin_data *p, cgi_pid_t *cgi_pid) { |