diff options
| author | jocuri%softhome.net <> | 2005-01-16 22:15:34 +0100 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2005-01-16 22:15:34 +0100 |
| commit | a3fa7395909a57c7811c2c82d7e5c2dc033d01de (patch) | |
| tree | 294a3cc3498f2f0e380cb8ce79c2a08e42d91272 /testserver.pl | |
| parent | 3b4174f1273818d1a01080ed8a97715c38e74e37 (diff) | |
| download | bugzilla-a3fa7395909a57c7811c2c82d7e5c2dc033d01de.tar.gz bugzilla-a3fa7395909a57c7811c2c82d7e5c2dc033d01de.tar.xz | |
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.
Diffstat (limited to 'testserver.pl')
| -rwxr-xr-x | testserver.pl | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |