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 2001/11/01 19:39:11 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
dougm 01/11/01 10:39:11
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
process ssl.conf.in first so ssl port will always be 8530 (or next after -port)
Revision Changes Path
1.79 +11 -1 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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- TestConfig.pm 2001/10/20 01:50:45 1.78
+++ TestConfig.pm 2001/11/01 18:39:11 1.79
@@ -814,14 +814,24 @@
sub generate_extra_conf {
my $self = shift;
- my(@extra_conf, @conf_in);
+ my(@extra_conf, @conf_in, @conf_files);
finddepth(sub {
return unless /\.conf\.in$/;
push @conf_in, catdir $File::Find::dir, $_;
}, $self->{vars}->{t_conf});
+ #make ssl port always be 8530 when available
for my $file (@conf_in) {
+ if (basename($file) =~ /^ssl/) {
+ unshift @conf_files, $file;
+ }
+ else {
+ push @conf_files, $file;
+ }
+ }
+
+ for my $file (@conf_files) {
(my $generated = $file) =~ s/\.in$//;
push @extra_conf, $generated;