stas 2004/01/18 00:08:39
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
if $self->{reconfigure} is true, make sure to perform a complete
reconfiguration, to solve the bug where conf.in files weren't reparsed
and vhost hostport info was getting lost on subsequent runs when
APACHE env var was set (one of the cases when $self->{reconfigure} is
true).
Revision Changes Path
1.81 +6 -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.80
retrieving revision 1.81
diff -u -u -r1.80 -r1.81
--- Changes 18 Jan 2004 06:53:53 -0000 1.80
+++ Changes 18 Jan 2004 08:08:39 -0000 1.81
@@ -8,6 +8,12 @@
=item 1.08_dev
+if $self->{reconfigure} is true, make sure to perform a complete
+reconfiguration, to solve the bug where conf.in files weren't reparsed
+and vhost hostport info was getting lost on subsequent runs when
+APACHE env var was set (one of the cases when $self->{reconfigure} is
+true). [Stas]
+
handle "Include conf/*conf" cases when inheriting httpd.conf in a
cleaner way, don't complain that "*conf" doesn't exist, since it's a
glob pattern. Instead check try to resolve the base directory. [Stas]
1.142 +12 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -u -r1.141 -r1.142
--- TestRun.pm 18 Jan 2004 07:54:06 -0000 1.141
+++ TestRun.pm 18 Jan 2004 08:08:39 -0000 1.142
@@ -419,6 +419,18 @@
$test_config->{vars}->{proxy} = 'off';
}
+ if (!$refreshed && $self->{reconfigure}) {
+ # XXX: there is a whole bunch of reasons, see above where
+ # $self->{reconfigure} is defined, could add reasons there or
+ # may be move the logic from there here?
+ warning "forcing re-configuration";
+ unless ($refreshed) {
+ $self->refresh;
+ $refreshed = 1;
+ $test_config = $self->{test_config};
+ }
+ }
+
return unless $$save;
my $preamble = sub { shift->preamble($opts->{preamble}) };
