From cf8e842b30edbdd20fc37487d7194efbd55ff2c0 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 3 Sep 2014 21:05:50 -0400
Subject: 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

---
 testserver.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testserver.pl')

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;
             }
         }
-- 
cgit v1.2.3-24-g4f1b