From a3fa7395909a57c7811c2c82d7e5c2dc033d01de Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Sun, 16 Jan 2005 21:15:34 +0000
Subject: Patch for bug 277210: Testserver.pl should find apache2/httpd2 as
 well when it looks for webservers; patch by Kieran Lal <kieran@gmail.com> and
 Colin S. Ogilvie <colin.ogilvie@gmail.com>, r=wurblzap, r=vladd, a=myk.

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

(limited to 'testserver.pl')

diff --git a/testserver.pl b/testserver.pl
index 3ce9f598b..df4f7145f 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|apache)\s+(\d+)$/) {
+            if ($line =~ /^(?:\S*\/)?(?:httpd|apache)2?\s+(\d+)$/) {
                 $sgid = $1 if $1 > $sgid;
             }
         }
-- 
cgit v1.2.3-24-g4f1b