You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2002/04/04 19:16:14 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
dougm 02/04/04 09:16:13
Modified: perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
Log:
make sure inherit_documentroot is always defined (in the case there is no httpd.conf
Revision Changes Path
1.21 +4 -3 httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm
Index: TestConfigParse.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestConfigParse.pm 14 Jan 2002 06:44:10 -0000 1.20
+++ TestConfigParse.pm 4 Apr 2002 17:16:13 -0000 1.21
@@ -138,6 +138,10 @@
$self->get_httpd_static_modules;
$self->get_httpd_defines;
+ #may change after parsing httpd.conf
+ $self->{vars}->{inherit_documentroot} =
+ catfile $self->{httpd_basedir}, 'htdocs';
+
my $file = $self->{vars}->{httpd_conf};
unless ($file and -e $file) {
@@ -187,9 +191,6 @@
$cv->($self, $c, $directive);
}
}
-
- $self->{vars}->{inherit_documentroot} ||=
- catfile $self->{httpd_basedir}, 'htdocs';
close $fh;
}