summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-01-21 21:45:39 +0000
committerLennart Poettering <lennart@poettering.net>2006-01-21 21:45:39 +0000
commita6abdd7ae8eb4510d30ef1c2a7deb04d2f7c0823 (patch)
treed12974121ed105495dea226f65e6652da145dc23
parent43c48320451c04db9c8550dc440ed443a9dcc120 (diff)
fix mod_dnssd for graceful restarts
git-svn-id: file:///home/lennart/svn/public/mod_dnssd/trunk@23 634eccf8-0006-0410-930e-e16565b0b7de
-rw-r--r--src/mod_dnssd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mod_dnssd.c b/src/mod_dnssd.c
index da49db3..03e869e 100644
--- a/src/mod_dnssd.c
+++ b/src/mod_dnssd.c
@@ -531,8 +531,6 @@ static void child_process(apr_pool_t *p, server_rec *server, struct global_confi
ap_assert(d);
- sleep(5);
-
unixd_setup_child();
if (pipe(sigterm_pipe_fds) < 0) {
@@ -621,7 +619,7 @@ static int start_child_process(apr_pool_t *p, server_rec *server, struct global_
break;
case APR_INPARENT:
- apr_pool_note_subprocess(p, proc, APR_KILL_AFTER_TIMEOUT);
+ apr_pool_note_subprocess(p, proc, APR_KILL_ONLY_ONCE);
/* ap_log_error(APLOG_MARK, APLOG_NOTICE, status, server, "Child process %lu", (unsigned long) proc->pid); */
break;
@@ -652,7 +650,7 @@ static int post_config(
}
if (d->enabled)
- return start_child_process(s->process->pool, s, d);
+ return start_child_process(pconf, s, d);
return OK;
}