From: jocuri%softhome.net <>
Date: Sun, 16 Jan 2005 21:29:53 +0000 (+0000)
Subject: Patch for bug 277210: Testserver.pl should find apache2/httpd2 as well when it looks... 
X-Git-Tag: bugzilla-2.18.1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc38d0adb055f5eebe498609040fbd31b8e5174;p=thirdparty%2Fbugzilla.git

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=justdave.
---

diff --git a/testserver.pl b/testserver.pl
index 3ce9f598bf..df4f7145fc 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;
             }
         }