dougm 00/04/13 16:31:52 Modified: . Makefile.PL Changes Log: User/Group for 'make test' can be overridden with the environment variables APACHE_USER/APACHE_GROUP Revision Changes Path 1.156 +4 -2 modperl/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl/Makefile.PL,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- Makefile.PL 2000/04/03 03:56:11 1.155 +++ Makefile.PL 2000/04/13 23:31:50 1.156 @@ -871,8 +871,10 @@ #use only first value if $) contains more than one $gid =~ s/^(\d+).*$/$1/; - $User = $Is_Win32 ? "nobody" : (getpwuid($uid) || "#$uid"); - $Group = $Is_Win32 ? "nogroup" : (getgrgid($gid) || "#$gid"); + $User = $Is_Win32 ? "nobody" : + $ENV{APACHE_USER} || (getpwuid($uid) || "#$uid"); + $Group = $Is_Win32 ? "nogroup" : + $ENV{APACHE_GROUP} || (getgrgid($gid) || "#$gid"); if($User eq "root") { my $other = (getpwnam('nobody'))[0]; 1.469 +3 -0 modperl/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl/Changes,v retrieving revision 1.468 retrieving revision 1.469 diff -u -r1.468 -r1.469 --- Changes 2000/04/13 18:43:21 1.468 +++ Changes 2000/04/13 23:31:50 1.469 @@ -10,6 +10,9 @@ =item 1.22_01-dev +User/Group for 'make test' can be overridden with the environment +variables APACHE_USER/APACHE_GROUP + fix PerlSetVar inheritance bug [Sander van Zoest <[EMAIL PROTECTED]>]