httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm
Date Sat, 17 Nov 2001 02:37:11 GMT
dougm       01/11/16 18:37:11

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  use %servername_config when generating httpd.conf so the base server has a port configured
  
  Revision  Changes    Path
  1.86      +11 -9     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.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- TestConfig.pm	2001/11/17 02:23:10	1.85
  +++ TestConfig.pm	2001/11/17 02:37:11	1.86
  @@ -971,18 +971,21 @@
   
       $self->preamble_run($out);
   
  -    if ($self->server->{rev} == 1) {
  -        for my $name (qw(port)) {
  -            print $out "\u$name    $vars->{$name}\n";
  -        }
  -    }
  -
       for my $name (qw(user group)) { #win32/cygwin do not support
           if ($vars->{$name}) {
               print $out "\u$name    $vars->{$name}\n";
           }
       }
   
  +    #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});
  +    for my $pair (@name_cfg) {
  +        print $out "@$pair\n";
  +    }
  +
       $self->replace_vars($in, $out);
   
       print $out "\n";
  @@ -1259,11 +1262,10 @@
   
   
   __DATA__
  +Listen     @Port@
  +
   ServerRoot   "@ServerRoot@"
   DocumentRoot "@DocumentRoot@"
  -
  -Listen     @Port@
  -ServerName @ServerName@
   
   PidFile     @t_logs@/httpd.pid
   ErrorLog    @t_logs@/error_log
  
  
  

Mime
View raw message