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.

git-svn-id: svn://10.0.0.236/trunk@167814 18797224-902f-48f8-a5cc-f745e15eee43
2005-01-16 13:15:34 +00:00
parent 65b4fc04b7
commit e71b259da8
1 changed files with 1 additions and 1 deletions
--- a/mozilla/webtools/bugzilla/testserver.pl
+++ b/mozilla/webtools/bugzilla/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;
            }
        }