httpd-test-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stas Bekman <s...@stason.org>
Subject Re: [Patch] Handle RedHat style Include conf.d/*.conf default configuration
Date Tue, 25 Nov 2003 00:20:27 GMT
Philippe M. Chiasson wrote:
> Apache-Test currently doesn't inherit RedHat style configuration layout.
> 
> Include conf.d/*.conf doesn't get expanded proprely, and most modules
> are not found/activated.
> 
> Following patch glob()es Include directive just in case

Nice, Philippe.

+1 after doing a proper indentation ;) please get rid of those tabs! and see 
below:

> Index: Apache-Test/lib/Apache/TestConfigParse.pm
> ===================================================================
> RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigParse.pm,v
> retrieving revision 1.37
> diff -u -I$Id: -r1.37 TestConfigParse.pm
> --- Apache-Test/lib/Apache/TestConfigParse.pm	10 Nov 2003 17:23:52 -0000	1.37
> +++ Apache-Test/lib/Apache/TestConfigParse.pm	24 Nov 2003 23:52:13 -0000
> @@ -243,8 +243,10 @@
>          (my $directive, $_) = split /\s+/, $_, 2;
>  
>          if ($directive eq "Include") {
> -            my $include = $self->server_file_rel2abs($_);
> -            $self->inherit_config_file_or_directory($include);
> +            foreach (glob($self->server_file_rel2abs($_))) {
> +               $self->inherit_config_file_or_directory($_);
> +	       }

Also please don't rely on $_ in the for loop that calls other functions. You 
never know what they will do to $_ without localizing it and suddenly weird 
things will start to happen. It's much safer to do:

          if ($directive eq "Include") {
              my $include = $self->server_file_rel2abs($_);
-            $self->inherit_config_file_or_directory($include);
+            foreach my $file ($include)) {
+               $self->inherit_config_file_or_directory($file);
+	       }
          }


__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com


Mime
View raw message