aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2014-09-03 21:05:50 -0400
committerDylan William Hardison <dylan@hardison.net>2014-09-03 21:09:48 -0400
commit7c8332df93f114b0a739d0cea80ecaafa7254cb5 (patch)
tree57dc37bdfebd864a57eb59e4e372fe4434692102
parentBug 1008766 - Fix typo in documentation (diff)
downloadgentoo-bugzilla-7c8332df93f114b0a739d0cea80ecaafa7254cb5.tar.gz
gentoo-bugzilla-7c8332df93f114b0a739d0cea80ecaafa7254cb5.tar.bz2
gentoo-bugzilla-7c8332df93f114b0a739d0cea80ecaafa7254cb5.zip
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
-rwxr-xr-xtestserver.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/testserver.pl b/testserver.pl
index d296b730f..77489d252 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -39,7 +39,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;
}
}