summaryrefslogtreecommitdiffstats
path: root/testserver.pl
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2014-09-04 03:05:50 +0200
committerDylan William Hardison <dylan@hardison.net>2014-09-04 03:05:50 +0200
commitcf8e842b30edbdd20fc37487d7194efbd55ff2c0 (patch)
tree532551a961c41ee3ba136484625e6667ac3c6ef4 /testserver.pl
parente0fbbde652bd6ff8112399fc7d7bc96f19e92994 (diff)
downloadbugzilla-cf8e842b30edbdd20fc37487d7194efbd55ff2c0.tar.gz
bugzilla-cf8e842b30edbdd20fc37487d7194efbd55ff2c0.tar.xz
Bug 1040728 - testserver.pl on Ubuntu 12.04 with Apache2 invalidly gives error 'Failed to find the GID for the 'httpd' process' due to truncated command name
r=gerv,a=sgreen
Diffstat (limited to 'testserver.pl')
-rwxr-xr-xtestserver.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/testserver.pl b/testserver.pl
index eeb783592..2ab48f375 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -42,7 +42,7 @@ if (!ON_WINDOWS) {
foreach my $pscmd (@pscmds) {
open PH, "$pscmd 2>/dev/null |";
while (my $line = <PH>) {
- if ($line =~ /^(?:\S*\/)?(?:httpd|apache)2?\s+(\d+)$/) {
+ if ($line =~ /^(?:\S*\/)?(?:httpd|apache?)2?\s+(\d+)$/) {
$sgid = $1 if $1 > $sgid;
}
}