You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2002/04/22 20:57:13 UTC
cvs commit: httpd-2.0/server/mpm/experimental/perchild config5.m4 perchild.c
rbb 02/04/22 11:57:13
Modified: . CHANGES
server/mpm/experimental/perchild config5.m4 perchild.c
Log:
Fix perchild MPM so that it can be configured with the move to the
experimental directory. Fix perchild MPM so that it uses ap_gname2id
for groups instead of ap_uname2id.
Submitted by: Scott Lamb <sl...@slamb.org>
Revision Changes Path
1.723 +6 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -r1.722 -r1.723
--- CHANGES 22 Apr 2002 08:08:36 -0000 1.722
+++ CHANGES 22 Apr 2002 18:57:12 -0000 1.723
@@ -1,5 +1,11 @@
Changes with Apache 2.0.36
+ *) Fix perchild MPM so that it can be configured with the move to the
+ experimental directory. [Scott Lamb <sl...@slamb.org>]
+
+ *) Fix perchild MPM so that it uses ap_gname2id for groups instead of
+ ap_uname2id. [Scott Lamb <sl...@slamb.org>]
+
*) Fix AcceptPathInfo. PR 8234 [Cliff Woolley]
*) [Security] Added the APLOG_TOCLIENT flag to ap_log_rerror() to
1.2 +1 -1 httpd-2.0/server/mpm/experimental/perchild/config5.m4
Index: config5.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/experimental/perchild/config5.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config5.m4 3 Apr 2001 18:37:12 -0000 1.1
+++ config5.m4 22 Apr 2002 18:57:12 -0000 1.2
@@ -2,5 +2,5 @@
if test "$MPM_NAME" = "perchild" ; then
- APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
+ APACHE_FAST_OUTPUT(server/mpm/$MPM_SUBDIR_NAME/Makefile)
fi
1.123 +2 -2 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.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- perchild.c 5 Apr 2002 02:23:02 -0000 1.122
+++ perchild.c 22 Apr 2002 18:57:12 -0000 1.123
@@ -1834,7 +1834,7 @@
}
ug->uid = ap_uname2id(u);
- ug->gid = ap_uname2id(g);
+ ug->gid = ap_gname2id(g);
#ifndef BIG_SECURITY_HOLE
if (ug->uid == 0 || ug->gid == 0) {
@@ -1851,7 +1851,7 @@
int i;
int matching = 0;
int u = ap_uname2id(uid);
- int g = ap_uname2id(gid);
+ int g = ap_gname2id(gid);
const char *errstr;
int socks[2];
perchild_server_conf *sconf = (perchild_server_conf *)