From: Jeff Trawick Date: Fri, 21 Jun 2002 11:00:43 +0000 (+0000) Subject: Fix perchild to work with apachectl by adding -k support to perchild. X-Git-Tag: 2.0.40~424 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa1cab5dc95c12349aabd867e33a7b0507b04673;p=apache Fix perchild to work with apachectl by adding -k support to perchild. PR: 10074 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95832 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 6c64f0f84b..38622a076d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ Changes with Apache 2.0.40 + *) Fix perchild to work with apachectl by adding -k support to perchild. + PR 10074 [Jeff Trawick] + *) Fix a silly htpasswd.c logic error that incorrectly reported that both -c and -n had been used. PR 9989 [Cliff Woolley] diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h index 21b696a73d..dc2d1dae9a 100644 --- a/server/mpm/experimental/perchild/mpm.h +++ b/server/mpm/experimental/perchild/mpm.h @@ -76,6 +76,7 @@ #define AP_MPM_WANT_SET_MAX_REQUESTS #define AP_MPM_WANT_SET_COREDUMPDIR #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH +#define AP_MPM_WANT_SIGNAL_SERVER #define AP_MPM_USES_POD #define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 97c3400b41..e4ffa937d5 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -1999,7 +1999,7 @@ static void *perchild_create_config(apr_pool_t *p, server_rec *s) module AP_MODULE_DECLARE_DATA mpm_perchild_module = { MPM20_MODULE_STUFF, - NULL, /* hook to run before apache parses args */ + ap_mpm_rewrite_args, /* hook to run before apache parses args */ NULL, /* create per-directory config structure */ NULL, /* merge per-directory config structures */ perchild_create_config, /* create per-server config structure */