stas 2004/05/12 16:52:04
Modified: perl-framework/Apache-Test/lib/Apache TestServer.pm
perl-framework/Apache-Test Changes
Log:
Improve the regex to match the Apache version out of 'httpd -v'
Submitted by: Michael A Nachbaur <[EMAIL PROTECTED]>
Revision Changes Path
1.82 +4 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm
Index: TestServer.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestServer.pm,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -u -r1.81 -r1.82
--- TestServer.pm 6 Mar 2004 02:07:58 -0000 1.81
+++ TestServer.pm 12 May 2004 23:52:04 -0000 1.82
@@ -55,6 +55,10 @@
$self->{version} = $self->{config}->httpd_version || '';
$self->{mpm} = $self->{config}->httpd_mpm || '';
($self->{rev}) = $self->{version} =~ m:^Apache/(\d)\.:;
+ ($self->{rev}) = $self->{version} =~ m:^Apache.*?/(\d)\.:
+ unless ($self->{rev});
+ ($self->{rev}) = $self->{version} =~ m:^.*?Apache.*?/(\d)\.:
+ unless ($self->{rev});
$self->{rev} ||= 2;
$self;
1.129 +3 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -u -r1.128 -r1.129
--- Changes 7 May 2004 17:59:22 -0000 1.128
+++ Changes 12 May 2004 23:52:04 -0000 1.129
@@ -8,6 +8,9 @@
=item 1.11-dev
+Improve the regex to match the Apache version out of 'httpd -v'
+[Michael A Nachbaur <[EMAIL PROTECTED]>]
+
-minclients is now what -maxclients used to be, -maxclients is now
really what it says it is [Stas]
