From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 4 Sep 2014 01:05:50 +0000 (-0400)
Subject: Bug 1040728 - testserver.pl on Ubuntu 12.04 with Apache2 invalidly gives error 'Faile... 
X-Git-Tag: bugzilla-4.5.6~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf8e842b30edbdd20fc37487d7194efbd55ff2c0;p=thirdparty%2Fbugzilla.git

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
---

diff --git a/testserver.pl b/testserver.pl
index eeb7835921..2ab48f3751 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;
             }
         }