dougm 01/11/16 18:43:13
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
cut down some noise with servername_config method
Revision Changes Path
1.87 +12 -5
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.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- TestConfig.pm 2001/11/17 02:37:11 1.86
+++ TestConfig.pm 2001/11/17 02:43:13 1.87
@@ -739,6 +739,11 @@
},
);
+sub servername_config {
+ my $self = shift;
+ $self->server->version_of(\%servername_config)->(@_);
+}
+
sub parse_vhost {
my($self, $line) = @_;
@@ -751,11 +756,13 @@
return undef;
}
+ my $vars = $self->{vars};
+
#if module ends with _ssl it is either the ssl module itself
#or another module that has a port for itself and another
#for itself with SSLEngine On, see mod_echo in extra.conf.in for example
my $have_module = $module =~ /_ssl$/ ?
- $self->{vars}->{ssl_module} : "$module.c";
+ $vars->{ssl_module} : "$module.c";
#don't allocate a port if this module is not configured
if ($module =~ /^mod_/ and not $self->{modules}->{$have_module}) {
@@ -766,8 +773,8 @@
my $port = $self->new_vhost($module);
#extra config that should go *inside* the <VirtualHost ...>
- my $in_cfg = $self->server->version_of(\%servername_config);
- my @in_config = $in_cfg->($self->{vars}->{servername}, $port);
+ my @in_config = $self->servername_config($vars->{servername},
+ $port);
#extra config that should go *outside* the <VirtualHost ...>
my @out_config = ([Listen => $port]);
@@ -980,8 +987,8 @@
#2.0: ServerName $ServerName:$Port
#1.3: ServerName $ServerName
# Port $Port
- my $scfg = $self->server->version_of(\%servername_config);
- my @name_cfg = $scfg->($vars->{servername}, $vars->{port});
+ my @name_cfg = $self->servername_config($vars->{servername},
+ $vars->{port});
for my $pair (@name_cfg) {
print $out "@$pair\n";
}
