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/21 20:24:47 UTC

cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm

dougm       01/11/21 11:24:47

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm
  Log:
  fix test module config parsing to deal with IfModule and nested containers
  
  Revision  Changes    Path
  1.41      +5 -0      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- TestConfigPerl.pm	2001/11/17 02:09:30	1.40
  +++ TestConfigPerl.pm	2001/11/21 19:24:47	1.41
  @@ -197,6 +197,7 @@
           last if /^\#endif/; #for .c modules
           next unless /\S+/;
           chomp;
  +        s/^\s+//;
           $self->replace;
           my($directive, $rest) = split /\s+/, $_, 2;
           if ($outside_container{$directive}) {
  @@ -213,6 +214,9 @@
                   $self->postamble($_);
               }
           }
  +        elsif ($directive =~ /IfModule/) {
  +            $self->postamble($_);
  +        }
           elsif ($directive =~ m/^<(\w+)/) {
               my $cfg;
               if ($directive eq '<VirtualHost') {
  @@ -227,6 +231,7 @@
               my $end = "</$1>";
               while (<$fh>) {
                   chomp;
  +                s/^\s+//;
                   $self->replace;
                   $self->postamble($_);
                   last if m:^\Q$end:;