Skip to content
This repository
Browse code

Allow processing of relative httpd.conf includes

  • Loading branch information...
commit e06722a66fec9a3ff54aaef5b43ace28e60a6afd 1 parent 109a8a3
Florian Ragwitz authored February 06, 2012

Showing 1 changed file with 6 additions and 2 deletions. Show diff stats Hide diff stats

  1. 8  inst/htprobe_apache2.pl
8  inst/htprobe_apache2.pl
@@ -27,7 +27,7 @@ =head1 See Also
27 27
 use FindBin;
28 28
 use lib "$FindBin::Bin/lib";
29 29
 use Bric::Inst qw(:all);
30  
-use File::Spec::Functions;
  30
+use File::Spec::Functions ':ALL';
31 31
 use Data::Dumper;
32 32
 
33 33
 # check whether questions should be asked
@@ -110,7 +110,11 @@ sub read_conf {
110 110
     # (note: this is wrong in htprobe_apache.pl, where I left it alone.)
111 111
     my $included = '';
112 112
     while ($AP{conf} =~ /^\s*Include\s+(.+)$/gim) {
113  
-        $included .= "\n" . slurp_conf($1);
  113
+        $included .= "\n" . slurp_conf(
  114
+            file_name_is_absolute($1)
  115
+                ? $1
  116
+                : rel2abs($1, $AP{HTTPD_ROOT})
  117
+        );
114 118
     }
115 119
     $AP{conf} .= $included;
116 120
 }

0 notes on commit e06722a

Please sign in to comment.
Something went wrong with that request. Please try again.