- fix when not using chroot feature

Changed files:
    httpd-2.0.50-peruser-r2.patch -> 1.2
    httpd-2.0.50-peruser-r3.patch -> 1.1

diff --git a/httpd-2.0.50-peruser-r2.patch b/httpd-2.0.50-peruser-r3.patch
similarity index 99%
rename from httpd-2.0.50-peruser-r2.patch
rename to httpd-2.0.50-peruser-r3.patch
index 3742c45326ae130d039fd8ec1f6f3b457dc6ff9a..f10ef1efc605655d1601128ac0f950acb4abec43 100644 (file)
--- a/httpd-2.0.50-peruser-r2.patch
+++ b/httpd-2.0.50-peruser-r3.patch
@@ -1122,7 +1122,7 @@ diff -Nur httpd-2.0.50/server/mpm/experimental/peruser/peruser.c httpd-2.0.50-ne
 +    {
 +        if(CHILD_INFO_TABLE[i].uid == sconf->uid &&
 +           CHILD_INFO_TABLE[i].gid == sconf->gid &&
-+           !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot))
++           (!sconf->chroot || !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot)))
 +        {
 +            total++;
 +        }
@@ -1139,7 +1139,7 @@ diff -Nur httpd-2.0.50/server/mpm/experimental/peruser/peruser.c httpd-2.0.50-ne
 +    {
 +        if(CHILD_INFO_TABLE[i].uid == sconf->uid &&
 +           CHILD_INFO_TABLE[i].gid == sconf->gid &&
-+           !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot) &&
++           (!sconf->chroot || !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot)) &&
 +           ap_scoreboard_image->servers[i][0].status == SERVER_READY)
 +        {
 +            total++;
@@ -1178,7 +1178,7 @@ diff -Nur httpd-2.0.50/server/mpm/experimental/peruser/peruser.c httpd-2.0.50-ne
 +        if(CHILD_INFO_TABLE[i].type == CHILD_TYPE_PROCESSOR &&
 +           CHILD_INFO_TABLE[i].uid == sconf->uid &&
 +           CHILD_INFO_TABLE[i].gid == sconf->gid &&
-+           !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot) &&
++           (!sconf->chroot || !strcmp(CHILD_INFO_TABLE[i].chroot, sconf->chroot)) &&
 +           (CHILD_INFO_TABLE[i].status == CHILD_STATUS_STANDBY ||
 +           CHILD_INFO_TABLE[i].status == CHILD_STATUS_ACTIVE))
 +        {