stas 2004/05/13 00:21:26
Modified: perl-framework/Apache-Test/lib/Apache TestServer.pm
perl-framework/Apache-Test Changes
Log:
- revert the dieing part as it breaks things. if we fail to match the
Apache revision (which is OK at the early stages, like 'perl Makefile.PL',
default to a non-existing revision 0. But provide no more misleading
defaults (used to default to revision 2 and then looking for mod_perl2).
- add the sample strings we are trying to match against when extracting
the revision number
Revision Changes Path
1.84 +14 -5
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.83
retrieving revision 1.84
diff -u -u -r1.83 -r1.84
--- TestServer.pm 13 May 2004 00:34:09 -0000 1.83
+++ TestServer.pm 13 May 2004 07:21:25 -0000 1.84
@@ -59,19 +59,28 @@
# try to get the revision number from the standard Apache version
# string and various variations made by distributions which mangle
# that string
+
+ # Apache/2.0.50-dev
($self->{rev}) = $self->{version} =~ m|^Apache/(\d)\.|;
+
+ # Apache-AdvancedExtranetServer/1.3.29 (Mandrake Linux/1mdk)
($self->{rev}) ||= $self->{version} =~ m|^Apache.*?/(\d)\.|;
+
+ # IBM_HTTP_SERVER/1.3.19 Apache/1.3.20 (Unix)
($self->{rev}) ||= $self->{version} =~ m|^.*?Apache.*?/(\d)\.|;
if ($self->{rev}) {
- debug "Matched Apache revision $self->{rev}";
+ debug "Matched Apache revision $self->{version} $self->{rev}";
}
else {
# guessing is not good as it'll only mislead users
- # honestly admit that we have failed to match one
- error "can't figure out Apache revision, from string: " .
- "'$self->{version}'";
- Apache::TestRun::exit_perl(0);
+ # and we can't die since a config object is required
+ # during Makefile.PL's write_perlscript when path to httpd may
+ # be unknown yet. so default to non-existing version 0 for now.
+ # and let TestRun.pm figure out the required pieces
+ debug "can't figure out Apache revision, from string: " .
+ "'$self->{version}', using a non-existing revision 0";
+ $self->{rev} = 0; # unknown
}
$self;
1.131 +4 -2 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -u -r1.130 -r1.131
--- Changes 13 May 2004 00:34:09 -0000 1.130
+++ Changes 13 May 2004 07:21:26 -0000 1.131
@@ -8,8 +8,10 @@
=item 1.11-dev
-Die if we fail to match the Apache revision. No more misleading
-defaults. [Stas]
+if we fail to match the Apache revision (which is OK at the early
+stages, like 'perl Makefile.PL', default to a non-existing revision
+0. But provide no more misleading defaults (used to default to
+revision 2 and then looking for mod_perl2). [Stas]
Improve the regex to match the Apache revision out of 'httpd -v'
[Michael A Nachbaur <[EMAIL PROTECTED]>]
