summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2004-08-28 18:05:55 +0200
committerjocuri%softhome.net <>2004-08-28 18:05:55 +0200
commite78dc329d8f354a3fe37def1ec3fb8d75492d8ca (patch)
tree6b5433c68c158915f6dc3ffa5b96755647e6f621
parent26640251cc8ace3a5fea3b6af121533150d8eed8 (diff)
downloadbugzilla-e78dc329d8f354a3fe37def1ec3fb8d75492d8ca.tar.gz
bugzilla-e78dc329d8f354a3fe37def1ec3fb8d75492d8ca.tar.xz
Patch for bug 254146: make the error message clear if servertest.pl failed to find the GID for HTTPD; patch by Byron Jones (glob) <bugzilla@glob.com.au>; r=joel, a=justdave.
-rwxr-xr-xtestserver.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/testserver.pl b/testserver.pl
index a2bd29656..3ce9f598b 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -43,7 +43,7 @@ if ($^O !~ /MSWin32/i) {
foreach my $pscmd (@pscmds) {
open PH, "$pscmd 2>/dev/null |";
while (my $line = <PH>) {
- if ($line =~ /^(?:\S*\/)?httpd\s+(\d+)$/) {
+ if ($line =~ /^(?:\S*\/)?(?:httpd|apache)\s+(\d+)$/) {
$sgid = $1 if $1 > $sgid;
}
}
@@ -76,7 +76,9 @@ Please refer to the webserver configuration section of the Bugzilla guide.
If you are using virtual hosts or suexec, this warning may not apply.\n";
}
} elsif ($^O !~ /MSWin32/i) {
- print "TEST-???? Could not identify group webserver is using.\n";
+ print
+"TEST-WARNING Failed to find the GID for the 'httpd' process, unable
+to validate webservergroup.\n";
}