mirror of
https://github.com/apache/httpd.git
synced 2026-01-25 07:01:39 +03:00
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
This commit is contained in:
3
CHANGES
3
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]
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user