stas 2003/04/28 18:33:30
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
autoconfigure /getfiles-* aliases only if the real values exist (otherwise
httpd won't start when Alias has no 2nd real value)
Revision Changes Path
1.155 +10 -6
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.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- TestConfig.pm 23 Apr 2003 02:24:16 -0000 1.154
+++ TestConfig.pm 29 Apr 2003 01:33:29 -0000 1.155
@@ -1186,6 +1186,11 @@
$self->gendir($self->{vars}->{t_conf});
}
+my %aliases = (
+ "perl-pod" => "perlpod",
+ "binary-httpd" => "httpd",
+ "binary-perl" => "perl",
+);
sub generate_httpd_conf {
my $self = shift;
my $vars = $self->{vars};
@@ -1250,6 +1255,11 @@
$self->replace_vars($in, $out);
+ for (keys %aliases) {
+ next unless $vars->{$aliases{$_}};
+ print $out "Alias /getfiles-$_ $vars->{$aliases{$_}}\n";
+ }
+
print $out "\n";
$self->postamble_run($out);
@@ -1632,9 +1642,3 @@
SetHandler server-status
</Location>
-#so we can test downloading some files of various size
-Alias /getfiles-perl-pod @PerlPod@
-
-#and some big ones
-Alias /getfiles-binary-httpd @httpd@
-Alias /getfiles-binary-perl @perl@
