stas 02/01/10 15:50:55
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
Don't include the httpd.conf file if httpd.conf.in exists
Submitted by: Rick Myers <[EMAIL PROTECTED]>
Reviewed by: stas
Revision Changes Path
1.120 +1 -0
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- TestConfig.pm 4 Jan 2002 17:14:48 -0000 1.119
+++ TestConfig.pm 10 Jan 2002 23:50:55 -0000 1.120
@@ -1101,6 +1101,7 @@
if (my $extra_conf = $self->generate_extra_conf) {
for my $file (@$extra_conf) {
if ($file =~ /\.conf$/) {
+ next if $file =~ m|/httpd\.conf$|;
$self->postamble(Include => qq("$file"));
}
elsif ($file =~ /\.pl$/) {
