Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #39 from rafl/master

Process relative httpd.conf includes when probing apache2 configuration
  • Loading branch information...
commit 70bb163b238dceed1266dc92d7a522b914535dbc 2 parents 109a8a3 + e06722a
@theory theory authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 inst/htprobe_apache2.pl
View
8 inst/htprobe_apache2.pl
@@ -27,7 +27,7 @@ =head1 See Also
use FindBin;
use lib "$FindBin::Bin/lib";
use Bric::Inst qw(:all);
-use File::Spec::Functions;
+use File::Spec::Functions ':ALL';
use Data::Dumper;
# check whether questions should be asked
@@ -110,7 +110,11 @@ sub read_conf {
# (note: this is wrong in htprobe_apache.pl, where I left it alone.)
my $included = '';
while ($AP{conf} =~ /^\s*Include\s+(.+)$/gim) {
- $included .= "\n" . slurp_conf($1);
+ $included .= "\n" . slurp_conf(
+ file_name_is_absolute($1)
+ ? $1
+ : rel2abs($1, $AP{HTTPD_ROOT})
+ );
}
$AP{conf} .= $included;
}
Please sign in to comment.
Something went wrong with that request. Please try again.