]> git.ipfire.org Git - thirdparty/bugzilla.git/commitdiff
Bug 1040728 - testserver.pl on Ubuntu 12.04 with Apache2 invalidly gives error 'Faile...
authorDylan William Hardison <dylan@hardison.net>
Thu, 4 Sep 2014 01:05:50 +0000 (21:05 -0400)
committerDylan William Hardison <dylan@hardison.net>
Thu, 4 Sep 2014 01:05:50 +0000 (21:05 -0400)
r=gerv,a=sgreen

testserver.pl

index eeb78359210264be528a1df60d11f9d3dda4c208..2ab48f3751738524898ec01917ce10dc83ebb7d0 100755 (executable)
@@ -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;
             }
         }