perl-test-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stas Bekman <s...@stason.org>
Subject Re: svn commit: r279322 - in /perl/Apache-Test/trunk: Changes lib/Apache/TestConfigParse.pm
Date Wed, 07 Sep 2005 17:41:20 GMT
geoff@apache.org wrote:
> Author: geoff
> Date: Wed Sep  7 06:22:50 2005
> New Revision: 279322
> 
> URL: http://svn.apache.org/viewcvs?rev=279322&view=rev
> Log:
> fall back on using httpd-defined HTTPD_ROOT as the base for
> httpd.conf if all other options fail
[...]
>              # SERVER_CONFIG_FILE might be an absolute path
> -            $file = $default_conf if !-e $file and -e $default_conf;
> +            if (! -e $file && -e $default_conf) {
> +                $file = $default_conf;
> +            }
> +            else {

what about ident 4?

> +              # try a little harder
> +              if (my $root = $self->{httpd_defines}->{HTTPD_ROOT}) {
> +                  debug "using HTTPD_ROOT to resolve $default_conf";
> +                  $file = catfile $root, $default_conf;
> +              }
> +            }



-- 
__________________________________________________________________
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://mailchannels.com

Mime
View raw message