Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@httpd.apache.org
Date: 19 Feb 2004 06:36:34 -0000
Message-ID: <20040219063634.32522.qmail@minotaur.apache.org>
From: stas@apache.org
To: httpd-test-cvs@apache.org
Subject: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
 TestConfig.pm

stas        2004/02/18 22:36:34

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
  Log:
  one more re-configure fix: vhosts cache needs to be invalidated as early
  as possible
  
  Revision  Changes    Path
  1.208     +11 -8     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.207
  retrieving revision 1.208
  diff -u -u -r1.207 -r1.208
  --- TestConfig.pm	19 Feb 2004 04:54:41 -0000	1.207
  +++ TestConfig.pm	19 Feb 2004 06:36:34 -0000	1.208
  @@ -1186,12 +1186,10 @@
           push @extra_conf, $generated;
       }
   
  -    # if at least one .in file was generated, regenerate them all (so
  -    # information like assigned port numbers will be correct)
  +    # if at least one .in file was modified or the derivative is
  +    # missing, regenerate them all (so information like assigned port
  +    # numbers will be correct)
       if ($self->extra_conf_files_needing_update) {
  -        # forget the vhosts cache, since a different port could be assigned
  -        $self->{vhosts} = {};
  -
           for my $file (@conf_files) {
               local $Apache::TestConfig::File = $file;
   
  @@ -1409,9 +1407,14 @@
                  -e $vars->{t_conf_file} &&
                  -M $exe < -M $vars->{t_conf_file};
   
  -    # if .in files are newer than their derived versions
  -    for my $file ($self->extra_conf_files_needing_update) {
  -        push @reasons, "$file.in is newer than $file";
  +    # any .in files are newer than their derived versions?
  +    if (my @files = $self->extra_conf_files_needing_update) {
  +        # invalidate the vhosts cache, since a different port could be
  +        # assigned on reparse
  +        $self->{vhosts} = {};
  +        for my $file (@files) {
  +            push @reasons, "$file.in is newer than $file";
  +        }
       }
   
       # if special env variables are used (since they can change any time)