perl-test-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1495994 - /perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
Date Mon, 24 Jun 2013 11:23:59 GMT
Author: jorton
Date: Mon Jun 24 11:23:59 2013
New Revision: 1495994

URL: http://svn.apache.org/r1495994
Log:
Starting with 2.4, Apache needs to read its configuration file even to
report its version and build parameters with the "-V" option, probably
because the MPM module can be chosen at run time.
 
However, the system Apache configuration may not be available to the user
building mod_perl, or it may depend on special environment variables or
the like. Make Apache-Test use the test configuration file and server
root instead for the "-V" invocations, if those are available.

Submitted by: Niko Tyni <ntyni debian.org>

Modified:
    perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm

Modified: perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm?rev=1495994&r1=1495993&r2=1495994&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestConfigParse.pm Mon Jun 24 11:23:59 2013
@@ -458,6 +458,13 @@ sub get_httpd_defines {
 
     $httpd = shell_ready($httpd);
     my $cmd = "$httpd -V";
+
+    my $httpdconf = $self->{vars}->{httpd_conf};
+    $cmd .= " -f $httpdconf" if $httpdconf;
+
+    my $serverroot = $self->{vars}->{serverroot};
+    $cmd .= " -d $serverroot" if $serverroot;
+
     my $proc = $self->open_cmd($cmd);
 
     while (<$proc>) {



Mime
View raw message