gozer 2003/11/25 17:11:42
Modified: perl-framework/Apache-Test Changes
perl-framework/Apache-Test/lib/Apache TestConfigParse.pm
Log:
Fix Apache::TestConfigParse to handle glob includes, like Include
conf/*.conf on RedHat.
Revision Changes Path
1.68 +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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Changes 24 Nov 2003 23:31:31 -0000 1.67
+++ Changes 26 Nov 2003 01:11:41 -0000 1.68
@@ -8,6 +8,9 @@
=item 1.07-dev
+Fix Apache::TestConfigParse to handle glob includes, like Include
+conf/*.conf on RedHat [Philippe M. Chiasson]
+
Fix Apache::TestConfig::add_config not to append " " at the end of the
config lines. This was a problem with config sections imported from
.pm files, the appended "" made it impossible to have multi-line
1.38 +3 -2
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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TestConfigParse.pm 10 Nov 2003 17:23:52 -0000 1.37
+++ TestConfigParse.pm 26 Nov 2003 01:11:42 -0000 1.38
@@ -243,8 +243,9 @@
(my $directive, $_) = split /\s+/, $_, 2;
if ($directive eq "Include") {
- my $include = $self->server_file_rel2abs($_);
- $self->inherit_config_file_or_directory($include);
+ foreach my $include (glob($self->server_file_rel2abs($_))) {
+ $self->inherit_config_file_or_directory($include);
+ }
}
#parse what we want
