Return-Path: Delivered-To: apmail-perl-test-dev-archive@www.apache.org Received: (qmail 37907 invoked from network); 2 Sep 2005 14:01:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Sep 2005 14:01:28 -0000 Received: (qmail 92517 invoked by uid 500); 2 Sep 2005 14:01:27 -0000 Mailing-List: contact test-dev-help@perl.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: test-dev@perl.apache.org Delivered-To: mailing list test-dev@perl.apache.org Received: (qmail 92491 invoked by uid 99); 2 Sep 2005 14:01:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2005 07:01:27 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [66.77.29.165] (HELO secure.exclamationlabs.net) (66.77.29.165) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2005 07:01:41 -0700 Received: from [192.168.2.160] (pcp0010776620pcs.walngs01.pa.comcast.net [69.141.1.101]) (authenticated (0 bits)) by secure.exclamationlabs.net (8.11.6/8.11.6) with ESMTP id j82E1Lr11533; Fri, 2 Sep 2005 09:01:21 -0500 Message-ID: <43185B30.3070205@modperlcookbook.org> Date: Fri, 02 Sep 2005 10:01:20 -0400 From: Geoffrey Young User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.3) Gecko/20040927 X-Accept-Language: en-us, en MIME-Version: 1.0 To: William McKee CC: modperl@perl.apache.org, test-dev@perl.apache.org Subject: Re: Apache::Test not finding global config file References: <20050825173040.GA7500@knowmad.com> <430E243D.9030305@p6m7g8.com> <20050825204719.GB5464@knowmad.com> <430E4CB9.4050200@p6m7g8.com> <20050831153858.GZ15602@knowmad.com> <4315D2D1.2070709@modperlcookbook.org> <20050831182020.GG15602@knowmad.com> In-Reply-To: <20050831182020.GG15602@knowmad.com> X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/mixed; boundary="------------090005000408040205040204" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------090005000408040205040204 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit William McKee wrote: > On Wed, Aug 31, 2005 at 11:54:57AM -0400, Geoffrey Young wrote: > >>$self->{httpd_basedir}, which looks to be calculated based on the location >>of the httpd binary. but it looks like it ought to be using HTTPD_ROOT >>instead. at least if it's defined. >> >>try this (completely untested) > > > Perfect! That worked just fine. How can we get it added to A::T? I've been thinking a bit about this and I think the attached is a better patch. basically, I think A-T goes through a lot of effort to separate the current filesystem configuration from the hard-coded stuff in httpd in an effort to make it easy to roll up an httpd install, move it someplace else, and still have A-T be able to create a worthy configuration. using HTTPD_ROOT like that kinda breaks all of that for people expecting the current behavior, so I'd rather use it as a last-ditch effort than off the bat. can you give it a whirl? --Geoff --------------090005000408040205040204 Content-Type: text/x-patch; name="httpd_root.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="httpd_root.patch" Index: lib/Apache/TestConfigParse.pm =================================================================== --- lib/Apache/TestConfigParse.pm (revision 265514) +++ lib/Apache/TestConfigParse.pm (working copy) @@ -341,7 +341,7 @@ my $extra_file = $self->{vars}->{httpd_conf_extra}; unless ($file and -e $file) { - if (my $base = $self->{httpd_basedir}) { + if (my $base = $self->{httpd_defines}->{HTTPD_ROOT} || $self->{httpd_basedir}) { my $default_conf = $self->{httpd_defines}->{SERVER_CONFIG_FILE}; $default_conf ||= catfile qw(conf httpd.conf); $file = catfile $base, $default_conf; --------------090005000408040205040204--