Patch for bug 277210: Testserver.pl should find apache2/httpd2 as well when it…

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.

Patch for bug 277210: Testserver.pl should find apache2/httpd2 as well when it…
a3fa7395 · jocuri%softhome.net · 3b4174f1 · a3fa7395
Commit a3fa7395 authored Jan 16, 2005 by jocuri%softhome.net
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

testserver.pl testserver.pl +1 -1

No files found.
--- 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;
            }
        }