You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/06/21 13:00:43 UTC
cvs commit: httpd-2.0/server/mpm/experimental/perchild mpm.h perchild.c
trawick 2002/06/21 04:00:43
Modified: . CHANGES
server/mpm/experimental/perchild mpm.h perchild.c
Log:
Fix perchild to work with apachectl by adding -k support to perchild.
PR: 10074
Revision Changes Path
1.843 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- CHANGES 19 Jun 2002 17:31:19 -0000 1.842
+++ CHANGES 21 Jun 2002 11:00:43 -0000 1.843
@@ -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]
1.17 +1 -0 httpd-2.0/server/mpm/experimental/perchild/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/mpm.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mpm.h 1 Apr 2002 08:27:42 -0000 1.16
+++ mpm.h 21 Jun 2002 11:00:43 -0000 1.17
@@ -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)
1.127 +1 -1 httpd-2.0/server/mpm/experimental/perchild/perchild.c
Index: perchild.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/perchild.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- perchild.c 13 Jun 2002 16:36:19 -0000 1.126
+++ perchild.c 21 Jun 2002 11:00:43 -0000 1.127
@@ -1999,7 +1999,7 @@
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 */